Merge "mke2fs.conf: Don't include resize_inode by default." am: ae435853a9 am: 88e0413bff am: 948b000106

Change-Id: I76bb70f4d7e97d389ba1da1c3b9a90337067e872