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

Change-Id: Ib0d88d24aaa6782c62e25ac50727b12435180439