Merge "Avoid extra calls into updateOomAdj"