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

Change-Id: Ie00b2258e92e93b45e4c859cbec11a374b4f7557