Merge "simpleperf: fix tracing counters."