diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index e85b39fc..10fb0e3d 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -167,6 +167,7 @@ TARGET_ENABLE_MEDIADRM_64 := true
 ifeq ($(HOST_OS),linux)
   ifneq ($(TARGET_BUILD_VARIANT),eng)
     ifeq ($(WITH_DEXPREOPT),)
+			DONT_DEXPREOPT_PREBUILTS := true
       WITH_DEXPREOPT := true
       WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true
     endif