Merge "Add hwcomposer to the system-background cpuset." into pi-dev