Merge "Add hwcomposer to the system-background cpuset." into pi-dev am: a381942170
am: 1327639a93

Change-Id: I37050f8701a44d0ad21748bbc88e643b9e59d2b8