Merge \"Merge \\\\\\\"add a property for controlling perf_event_paranoid\\\\\\\" into mnc-dev am: 050243df76 am: f11efb251d am: 2a311a9b38 am: 2d48c395cc am: 34ae543dc3 am: 2ef8922c29\" into nyc-mr1-dev-plus-aosp
am: 70fbe30c9a

Change-Id: I91c7828be978f644ba4bb2929ce93b5d617c846a