Merge "adb-remount-test: adb_reboot stdin issue"
am: 2dca188503

Change-Id: Ic1f2b0741ef5f2b8bf48129a7e49e4c57aa4a926