Merge \"add a property for controlling perf_event_paranoid\" into mnc-dev
am: 050243df76

Change-Id: Ifc1f319c5d81ed9f5735468d14d7a795b836f373