Merge "Track google-benchmark API changes."