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

* commit 'c70ac57db0df9736f50a6b1fe29b151292b09e6b':
  adb: poll for emulator connection.