Merge "Merge "fs_mgr: replace make_ext4 api with e2fsprogs" into oc-dr1-dev am: 3d7422dbfe  -s ours" into oc-dr1-dev-plus-aosp