War on terror trumps promoting Ethiopian democracy