Merge "Add support for creating ext4 images with mke2fs"