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

Change-Id: I4d48c0af6580e48192ee455fc44286b64620a3f6