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

Change-Id: I4e242646ec15b2b54c44186770a32cf7b27b356c