Some makefiles include JavaCompilation.gmk when they really want to include ZipArchive.gmk. (Currently, JavaCompilation.gmk includes ZipArchive.gmk indirectly to keep backwards compatibility from when these were implemented in the same file.)

Also, all files that calls SetupJarArchive should include JarArchive.gmk directly.