[automerger skipped] Push cameraserver downstream from base_system.mk. am: 9d717edf6c
am: 406e163b79  -s ours

Change-Id: I03ddd87e67919af35ddbefd1b28c7b333b68ff9f