Al-Bashir visits Ethiopia despite war-crime warrant