Merge "Add hwcomposer to the system-background cpuset for hal v2.2" into pi-dev