Merge "Use curAdj in place of maxAdj to correctly record oom_score while collecting ProcessMemoryState."