Merge "Fix create_test_jar.sh for compilation with OpenJDK 9 javac."