Merge "Merge "recovery: replace make_ext4 with e2fsprogs" into oc-dr1-dev am: bee95d6866" into oc-dr1-dev-plus-aosp
am: 114b555807  -s ours

Change-Id: I013b898521c2563d2cf9ed85ce51324c25c0004b