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

Change-Id: I9c2a95c51aa40e61180e87df84d77db258bffb81