Merge "mke2fs.conf: Don't include resize_inode by default." am: ae435853a9

Change-Id: I2564085ebe1b3224527ba03ad18e85890af773a5