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

Change-Id: Id5620775d1bc3532ba3e5fc026dfc2ddf5928b01