Merge pull request #10332 from zhangskz/benchmark

Revert third_party/benchmark changes from sync