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

Change-Id: I7f9cc3032a9c9f5f009fc50ace25f33e35c46269