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

Change-Id: Ia6f3940b52c28741a43be171c930d0cdd77fb454