Merge "simpleperf: add perf counter into trace"
am: a697736734

Change-Id: I317b14d9d3ffc648b6c2ba74f97cd332a4a59240