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

Change-Id: I76f98d45e343431460cb53ff3d38ca6ac334e3c9