[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 7ebbf2cfc2  -s ours
am: 551999e4d2  -s ours

Change-Id: Ib459b5abd13e81f59684069cac3c43f62b88552b
diff --git a/car_product/build/car_base.mk b/car_product/build/car_base.mk
index bd5f9cd..2f3bbaa 100644
--- a/car_product/build/car_base.mk
+++ b/car_product/build/car_base.mk
@@ -42,6 +42,7 @@
     MmsService \
     ExternalStorageProvider \
     atrace \
+    cameraserver \
     libandroidfw \
     libaudioutils \
     libmdnssd \