Merge "Fix CharsetUtf8PerfTest."