Merge "adb: avoid consuming input in `adb remount`." am: 97186600b5 am: 955738001d am: 88bc63946a

Change-Id: I664b62b6e54d386b78dcfaed6b3f72ca4aa10bbe