Merge "adb: avoid consuming input in `adb remount`."