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

Change-Id: I0a75682409ef24a898e77aecb5e9adab1da5405f