Merge "Update to follow the new google benchmark API"