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

Change-Id: I26e2c3c7cb2846f818519afce0f6364b97170f36