Merge "Port openJDK8 changes to java.nio.charset"