Merge "Avoid calling updateOomAdj an extra time" into pi-dev