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

Change-Id: I6962c166df8ebd7f701fcaace85796dba8a245f7