Merge "fs_mgr: Split fs_mgr_overlayfs into two separate files." into main