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

Change-Id: Ia40a85f08db85e8fa6c726685fa903ef40d5d18a