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