Merge "Fix 64-bit benchmark build"