Merge "ext4_utils: add default mke2fs.conf"
am: 5e42819865

Change-Id: If07bcc1a3b708ff17172a18a99abc45aef193eeb