Merge "Replace make_ext4fs with mke2fs"