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

Change-Id: I8f72b4f2bbde8e70660e0088a7d874851f4f7004