diff --git a/shared/auto/device.mk b/shared/auto/device.mk
index 9a50cda..1c036cc 100644
--- a/shared/auto/device.mk
+++ b/shared/auto/device.mk
@@ -73,6 +73,10 @@
     libcuttlefish-ril \
     libcuttlefish-rild
 
+# system_other support
+PRODUCT_PACKAGES += \
+    cppreopts.sh \
+
 BOARD_IS_AUTOMOTIVE := true
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)