Merge "fs_mgr: overlayfs: replace adb reboot -R with adb remount -R"