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

Change-Id: I61f7254853e1d730cb2b2af1f38be91d6b335aeb