[automerger skipped] Push cameraserver downstream from base_system.mk. am: 75add9d313
am: 0d80a9505c  -s ours

Change-Id: I3ce0a8a5100b10d5305a80c4992990e9c19fa811