Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866
am: 987c5a98a8  -s ours

Change-Id: Ia186c727dd25fb7b5aa13914bd1ad72392870e21