Merge "adb: Fix `adb remount`"