Merge "adb: Avoid waiting for emulator connections"