Merge "build: Split out mkfs in BuildImageMkfs"