Merge "ext4_utils: add default mke2fs.conf" am: 5e42819865 am: 364f44e607
am: 0ba04f4917  -s ours

Change-Id: I6f116fcab05fc7317daee0a2125dbc61674e4e18