Merge "Clean up / update MockingOomAdjusterTests"