Merge "Improve cpuset support for surfaceflinger."