Merge "fs_mgr: overlayfs: erofs is in staging" am: 932e77137c am: 7859d9c581
am: 91f70ccecd

Change-Id: I21b36d3682816205943b7f115fd66976d9855231