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

Change-Id: I8c41df4543417a247a6816f055ee6d512a6cbec1