Merge changes I49d02362,I8cdf96ed

* changes:
  Change CacheOomRanker's "uses" feature.
  Fix race condition when using mPreserveTopNApps.