Merge "Fix clang-tidy performance warnings in simpleperf."