Merge "Track google-benchmark API changes." am: 9a8757ded5
am: b55d843217

Change-Id: Ia1f1454a91cd22aa1263cbdcc00adf90b511f935