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

Change-Id: Id43e42b2f5fbf58c32b5d70b00e5671d7e244914