Merge "Reduce oom_score_adj to zero for perfprofd." am: 5157212f42
am: ecdaa52106

* commit 'ecdaa52106aa2d77461e491a430d1073222cd42b':
  Reduce oom_score_adj to zero for perfprofd.