[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 1d5c584ad9  -s ours
am: 182903f61e  -s ours

Change-Id: Ib4ae91765830f8345c755198b9375e8826bf4f58
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 \