master
8258407: Split up CompileJavaModules.gmk into make/modules/$M/Java.gmk
8244044: Refactor phase makefiles to be structured per module