Merge "Update to follow the new google benchmark API" am: d22ba181d0 am: bbd62aff7a
am: 3a385294bf

Change-Id: I4b71a307f113454f373fff41bae13bc9ab96e7c0