am 20e8b384: am c70ac57d: Merge "adb: poll for emulator connection."

* commit '20e8b384c6ad8718764e138cc9013623cad8f400':
  adb: poll for emulator connection.