Android 6.0.1 release 7
Merge "Enable cpusets on shamu." into mnc-dr-dev