diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index b27f5dd..af1cccf 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -122,7 +122,7 @@ ifeq ($(HOST_OS),linux)
     endif
   endif
 endif
-WITH_DEXPREOPT_BOOT_IMG_ONLY ?= true
+WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY ?= true
 
 # Display
 BOARD_USES_ADRENO := true