Merge "cameraserver: move cameraserver to the camera-daemon cpuset" into nyc-mr1-dev