Merge "mke2fs: Don't require mke2fs.conf on Windows." am: 24ff14fcd1
am: d471428695

Change-Id: I4e25e84ae33196de207686bfd1606d61608b3a22