Merge "BENCHMARK_MAIN now needs a trailing semicolon."