Merge "disable unpriv perf by default in user{,debug} builds"