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

Change-Id: I7329e6edcd6e5b3ff786d2f74587d254d8b05be0