Merge "adb: reunregress waiting for device on start-server." am: 72076d1aa7
am: 08a70ac6e5

Change-Id: Ie379f49929c8b11544328694fd1a438e63da453d