Merge "fs_mgr: overlayfs: erofs is in staging"