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

Change-Id: Ia235a14890d1538b32e2bef37ba29f1df0dbab1b