Merge \\"simpleperf: add type modifier when reporting events.\\" am: 90d56472a6
am: fb768fd700

Change-Id: I544470c367fa0b188b5bb0a1b570efcddd0bdec1