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

Change-Id: I7ede9f12f82197b203d125464c99af9256587509