Merge "add a property for controlling perf_event_paranoid" am: 9292d7dae3 am: a6d6f45037
am: 680b2f3cb6

* commit '680b2f3cb61e29a46d0d6bdf89394dd96e82f201':
  add a property for controlling perf_event_paranoid

Change-Id: I23b928d61d2fa81637aefa09c34bf0e20777ad55