Merge "Add mke2fs.conf to otatools"