US envoy returns from Ethiopia as Washington urges end to conflict