Merge "Fix checkapi for OpenJDK 9 builds"