Merge \"disable unpriv perf by default in user{,debug} builds\" into mnc-dev
am: 11c84f95fb

Change-Id: Ic82b49068c2d6c834bafb01ea3f698bb9e84d1ac