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

Change-Id: I01b8848db10d40e531b6fc771d55f4b0c8d06088