am 8f0daa52: am 2df4804a: (-s ours) am 20e8b384: am c70ac57d: Merge "adb: poll for emulator connection."

* commit '8f0daa520dfd4bc29c04cb85799abf8fd648bd7b':