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

Change-Id: Id9fa451774843f4f8d6cfa960c2ec21cee31e210