Merge "cameraserver: Add support for system only cameras"