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

Change-Id: Ie5065ff193bfe187683e729d589138c24f4f2fac