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