Merge \"Merge \\\\\\\"add a property for controlling...

Merge \"Merge \\\\\\\"add a property for controlling perf_event_paranoid\\\\\\\" into mnc-dev am: 050243df am: f11efb25 am: 2a311a9b am: 2d48c395 am: 34ae543d am: 2ef8922c\" into nyc-mr1-dev-plus-aosp
am: 70fbe30c

Change-Id: I91c7828be978f644ba4bb2929ce93b5d617c846a