master
8257733: Move module-specific data from make to respective module
8244044: Refactor phase makefiles to be structured per module