Merge "Remove cpusets and schedboost product variables"
am: 1adeeb8b3c

Change-Id: I850154eab83fa021423630d935b84afa20e7eced