Merge "mediaserver: Allow finding cameraserver" into nyc-dev