Merge \"cameraserver: move cameraserver to the camera-daemon cpuset\" into nyc-mr1-dev
am: 36ff576ec7

Change-Id: Ic886c7c574bf99f568a5550730f64f75eda45456