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

Change-Id: I7b0b6974ad6e90b8143515d486299d75ca8d1a64