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