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

Change-Id: Ie31a736b2edd33c1cebbc08fbc39b555d501a349