Merge "Fix vm-tests-ft for OpenJDK 9 toolchain."