Merge "Switch frameworks/base over from @hidden Charsets to public StandardCharsets."