Merge "fs_mgr: replace make_ext4 api with e2fsprogs"