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

Change-Id: Ia3f2517a1eaf4452eee75383d985f222b062837b