Merge changes I797c81a5,I127c1204

* changes:
  Remove WM lock from WPC#computeOomAdjFromActivities
  Remove rankTaskLayersIfNeeded from oom-adjustment calculation