Merge "simpleperf: fix raw event names."
am: 193ca49c16

Change-Id: I3e5429beeb007dafe5665e5a56d723168af3b140