Merge "ext4_utils: update default conf from e2fsprogs" am: c1dd830eaf
am: 99361dd165

Change-Id: Iccd829d75797a6cd51d6532c132e094b5507c0e8