diff --git a/BoardConfig.mk b/BoardConfig.mk
index c288ec4..5bdb59a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -43,14 +43,7 @@ BOARD_SUPPORTS_SOUND_TRIGGER := true
 BOARD_USES_ALSA_AUDIO := true
 
 # Dexpreopt
-# [NOTE] This section might assign to readonly variable of Android build system.
-# [NOTE] Please keep only WITH_DEXPREOPT_DEBUG_INFO then remove others, if no patch (repo_XX.diff) is applied.
 LOCAL_DEX_PREOPT := true
-PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER := everything
-PRODUCT_DEX_PREOPT_DEFAULT_FLAGS := --compiler-filter=everything
-PRODUCT_OTHER_JAVA_DEBUG_INFO := false
-PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := everything
-PRODUCT_SYSTEM_SERVER_DEBUG_INFO := false
 USE_DEX2OAT_DEBUG := false
 WITH_DEXPREOPT_DEBUG_INFO := false
 
diff --git a/device.mk b/device.mk
index 18aaf41..ff0e77a 100644
--- a/device.mk
+++ b/device.mk
@@ -94,6 +94,13 @@ PRODUCT_COPY_FILES += \
 # DebugFS
 PRODUCT_SET_DEBUGFS_RESTRICTIONS := true
 
+# Dexpreopt
+PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER := everything
+PRODUCT_DEX_PREOPT_DEFAULT_FLAGS := --compiler-filter=everything
+PRODUCT_OTHER_JAVA_DEBUG_INFO := false
+PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := everything
+PRODUCT_SYSTEM_SERVER_DEBUG_INFO := false
+
 # Display
 PRODUCT_PACKAGES += \
     android.hardware.graphics.allocator@2.0-impl:64 \
diff --git a/repo_21.diff b/repo_21.diff
index 1ff032d..bc5de66 100644
--- a/repo_21.diff
+++ b/repo_21.diff
@@ -26,24 +26,6 @@ index 5fbc916..a68057d 100644
  endif
  endif
 
-diff --git a/core/product.mk b/core/product.mk
-index 0411fe2..be10e7e 100644
---- a/core/product.mk
-+++ b/core/product.mk
-@@ -574,7 +574,12 @@ _readonly_late_variables += \
-   PRODUCT_COPY_FILES \
-   PRODUCT_DEX_PREOPT_NEVER_ALLOW_STRIPPING \
-   PRODUCT_DEX_PREOPT_BOOT_FLAGS \
--  PRODUCT_SOONG_NAMESPACES
-+  PRODUCT_SOONG_NAMESPACES \
-+  PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER \
-+  PRODUCT_DEX_PREOPT_DEFAULT_FLAGS \
-+  PRODUCT_OTHER_JAVA_DEBUG_INFO \
-+  PRODUCT_SYSTEM_SERVER_COMPILER_FILTER \
-+  PRODUCT_SYSTEM_SERVER_DEBUG_INFO
-
- _readonly_early_variables := $(filter-out $(_readonly_late_variables),$(_product_var_list))
-
 diff --git a/core/sysprop.mk b/core/sysprop.mk
 index 0fcc92c..7bf2989 100644
 --- a/core/sysprop.mk