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

Change-Id: I0808432085ed4cd6b9c91e29ee7324cd12b3df3d