Merge "Track google-benchmark API change." am: 239663cf97
am: e2feba2535

Change-Id: Ifc6f0f80dede21c6d919df0c25eb47c7fa124add