Merge "Port openJDK8 changes to java.nio.charset" am: 13ff49ea4f am: 1ade8e7704
am: 2ae483c42b

Change-Id: I04dfdff8eb7d297283ce5148e61aac6a5338c053