Merge "Push cameraserver downstream from base_system.mk." into pi-dev-plus-aosp