Merge "Fix a regression in setting oom_adj for cached processes" into qt-dev am: 4025715b3e am: 38cbdfeccf
am: 68d91025d5

Change-Id: I75cba333d2c89c299ff5707ce755db20540e285f