Merge "adb: Avoid waiting for emulator connections" am: 8ef8d1eb6b
am: 142eeae546

Change-Id: I4d9a888b7d7521ad0428aa33af6d24143818162b