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

Change-Id: If57b0b977b6e25c1eb846b848fff167999bcb543