Merge "Integrate OpenJDK 9 fix for double-close." am: db54a53f81 am: bd84e4a7ed am: d13bf1df4d

Change-Id: I35dc16d75e8da0aec51085cb65ae8b07ad592e47