Merge "Fix format string for new google benchmark"
am: a850fb2d1e

Change-Id: I63e9a8ae52ab45f389b474c3c28b95b50c7fdea0