diff --git a/config/common.mk b/config/common.mk
index 63e610b..b50de1d 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -78,6 +78,14 @@
 PRODUCT_COPY_FILES += \
     frameworks/base/data/keyboards/Vendor_045e_Product_028e.kl:system/usr/keylayout/Vendor_045e_Product_0719.kl
 
+# Do not include art debug targets
+PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false
+
+# Strip the local variable table and the local variable type table to reduce
+# the size of the system image. This has no bearing on stack traces, but will
+# leave less information available via JDWP.
+PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := true
+
 # World APN list
 PRODUCT_COPY_FILES += \
     vendor/bliss/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml