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

Change-Id: I3720cad78b1d8449c3e1cfedc57bc3c673c73b80