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

Change-Id: Ic01a5a8a85b0c319cb3e8bebeac857a1f30814ef