Merge "disable unpriv perf by default in user{,debug} builds"
am: 4bc8280a98

* commit '4bc8280a9886d93870fab02eea73986d8ca08965':
  disable unpriv perf by default in user{,debug} builds

Change-Id: Icb4e1ad8ec0bd491a99b541ac98dc95bf509aa63