Merge "fs_mgr: replace make_ext4 api with e2fsprogs" am: ff9c7c5e3e am: 76fd6f6cf1 am: 6fcabd14ca  -s ours
am: 891d0e3f03

Change-Id: I24c158946ab4f0abdb66d0b59b51abd573ff5663