Merge "remount: Refactor fs_mgr_overlayfs_scratch_device()."