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

Change-Id: Ie2a0a7495696e74c9af44c35e3759219c07d4de9