Merge "Fix a regression in setting oom_adj for cached processes" into qt-dev am: 4025715b3e am: 40d13af878
am: a636bee7d4

Change-Id: I85565693eeb03a5a2011990d8ad06c0a05f7926f