Merge "OpenJDK 11: Merging sun.nio.ch.* trivial changes"