Merge "Track google-benchmark API change."