Merge "adb: reunregress waiting for device on start-server."