Sync ImageBuildMakefile with latest code from puavo-build-image.