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

* commit '4f38fea31317cc2a052851fbfd5ff6f503f14781':
  adb: poll for emulator connection.