Merge "Fix for incorrect cycle evaluation in computeOomAdj"