Merge "simpleperf: add perf counter into trace"