Merge "Do not set the group and cpuset for the OomAdjuster thread" into sc-dev