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