Merge "simpleperf: fix tracing counters." am: 2a427fcc8b am: f9d8e454b6
am: 489c9835f6

Change-Id: I460cbfe7d89071dccf220982668d09db4787d238