Move current java builds into java-openjdk7