Merge "Revert "build: Split out mkfs in BuildImageMkfs""