Merge "recovery: replace make_ext4 with e2fsprogs" am: f7c00ddaf6 am: 9203641742 am: 7cdc58497b am: 6fc893ebca
am: ac58c9f87b

Change-Id: If23d3ad9082ffddb75a052c7cca79b0f902756c1