Merge "Removed build time variable ENABLE_CPUSETS." am: 52a60e08fb am: 33f4b64f23
am: eb8be8f5e9

Change-Id: I9624618aae00134414e946e3f6df97e89c5b7495