Merge "Add oom_score_adj_update to atrace.rc"