Merge "Fixing deadlock in OomAdjProfiler."