Merge "Merge java.nio.charset from jdk-11.0.13-ga into the aosp/master branch"