Merge "Move servicemanager into system-background cpuset." into nyc-dev am: 62b6bc7
am: b1045d2

* commit 'b1045d2d75290383d1cc5517614ec5f4da939e44':
  Move servicemanager into system-background cpuset.

Change-Id: Ibaa53c84ceaf7c608cb39857033bb609d2ee96cf