Merge "Move oom adjust related code to OomAdjuster"