Merge "Port openJDK8 changes to java.nio.charset"
am: 13ff49ea4f

Change-Id: I809d0f637c384d9bde4b54722bcf353af21bd49a