Merge "remount: Simplify fs_mgr_overlayfs_setup."