Merge "adb: make root/unroot wait for the device to come back."
am: 59d4c8a352

Change-Id: I42b87ad02870afa07631c3a9b7a9468570f1f8ae