Merge "ext4_utils: copy mke2fs.conf to recovery /etc" into oc-dr1-dev am: ec913d2a15
am: 345d22c94a  -s ours

Change-Id: I3c0f8f4a7c0f614da34903addc680aa9a6839210