ImageBuildMakefile can go, it is in puavo-image repository,
and it might even disappear entirely...