Right now CompileJavaModules.gmk contains two different part: one part with the functionality needed to compile a java module, and one part were all special requirements for all modules are listed.

The second part should be removed from CompileJavaModules.gmk, and instead listed directly for each individual module in make/modules/$M/Java.gmk.