Merge "simpleperf: update test for --trace-offcpu."