Merge "Remove unused code from CharsetBenchmark."