Merge "Port openJdk8 changes to sun.nio.ch package"