Merge "add a property for controlling perf_event_paranoid am: fe01f56c0d am: 12d2422ef0" into nyc-mr1-dev-plus-aosp
am: 8ea14bd154

* commit '8ea14bd15486833997efff66601c17863c9d3416':

Change-Id: I9359989e31385848dc67731d756e690fbb359e8f