Merge "adb: use /system/bin/remount command"