Merge "Merge "ext4_utils: copy mke2fs.conf to /etc" into oc-dr1-dev am: 7f60c1a8af" into oc-dr1-dev-plus-aosp
am: c6ac1de500  -s ours

Change-Id: I369339bcad1f3b7455d5f6b3295be74094e05906