Merge \\\"adb: make adb root not wait-for-device.\\\" am: 81e59ca5a7 am: ba7aea829b
am: 483d68ece4

Change-Id: I66cd2297d253ecf95843d85d2670c047ff816548