Merge "fs_mgr: replace make_ext4 api with e2fsprogs" am: ff9c7c5e3e
am: 76fd6f6cf1

Change-Id: Ie068ba3db08b8b3ecc3a2f6ea8c14f17ec2a4390