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

Change-Id: I9d5431f5367f2b18d029c133235233a483f74113