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

Change-Id: I4e256675d3299d6f46f3e03b0444ab4de8434f43