Merge "adb: make adb root not wait-for-device."