master
8244044: Refactor phase makefiles to be structured per module
8245287: Start using ModuleWrapper for gensrc as well