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

Change-Id: I64fe736a477a006f3e77589aa279f423d9335682