Merge "Clean up CharsetDecoder and CharsetEncoder."