[automerger skipped] Merge "Push cameraserver downstream from base_system.mk." am: 8f3d20ffbf
am: dd574b241d  -s ours

Change-Id: Ia8c95ce84bb61e99dd7485f5c444d2cdd5fb1400