Merge "recovery: replace make_ext4 with e2fsprogs" am: f7c00ddaf6
am: 9203641742

Change-Id: I8e23f2622021e8bae61a3dc4954c665c7fc85ccf