Merge "Small oom_adj tweaks."