Merge "simpleperf: add type modifier when reporting events."