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

Change-Id: Ief19de3a9eec1597d00a40a036d08150dbe30fb2