Merge "adb: fix adb remount -R"