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