Merge "eas: Making cameraserver part of foreground stune cgroup" into nyc-mr1-dev