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

Change-Id: I67a9066b3e91c260c8140af729ea935c7537cd21