Merge "Push cameraserver downstream from base_system.mk."