Merge trace_oom_score_adj_update from 3.4 upstream kernel