Merge "Turned ENABLE_CPUSETS into runtime decision." am: d95aa50b18
am: 7eca8f7073

Change-Id: I96e38dc38e372a27990b9cd1bda9f04676f13eb8