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

Change-Id: I15d803cc98a8d9010cabe342a45ca916fb625db7