Merge "simpleperf: fix raw event names."