Merge "Fix for incorrect cycle evaluation in computeOomAdj DO NOT MERGE" into pi-dev
am: 9d77aaec85

Change-Id: Ie4e65d42c44a2a45418f5bd27155efc6c4869276