Merge "Integrate OpenJDK 9 fix for double-close."