When bringing changes from jdk9 to jigsaw/jake, the merges have become quite involved. The build files in jdk9 and jake have also diverged unnecessarily over time. I would like to bring them back closer to each other so that we are only carrying the changes we really need to in jake.