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

Change-Id: I27fe08451102e819168f5a13ce044d105c2ff40b