Merge "adb: avoid consuming input in `adb remount`." am: adb61a7013 am: 955738001d

Change-Id: I5c9acf31993f2039ac2848927beef4c19f8f6d3b