master
8244044: Refactor phase makefiles to be structured per module
8248610: Clean up handling of Windows RC files