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

Change-Id: Ifd97af48afbfaff329dc4cc2d613d018c0538efc