Merge "fix testProcSelf{,Score}OomAdjSane tests" into stage-aosp-pi-cts-dev
am: 551542260a

Change-Id: Ie08d586793bcc2a859612b9aa31879206ea37b5f