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

Change-Id: I3660f8f2355e84b13b3a296b85fc49f2698f03a4