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

Change-Id: I93ac3675f3d9d26a3a48284b8e8a53df9095bdf4