Merge "adb-remount-test: adb_reboot stdin issue"