Revert "Move dexpreopting to Soong"
This reverts commit e736c58043290dad18ddbd690d554cdc413157a8.
Test: none
Bug: 119412419
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 0fce502..799425f 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -256,7 +256,6 @@
LOCAL_SHARED_ANDROID_LIBRARIES:=
LOCAL_SHARED_LIBRARIES:=
LOCAL_SOONG_AAR :=
-LOCAL_SOONG_BUILT_INSTALLED :=
LOCAL_SOONG_BUNDLE :=
LOCAL_SOONG_CLASSES_JAR :=
LOCAL_SOONG_DEX_JAR :=
@@ -279,6 +278,7 @@
LOCAL_STATIC_JAVA_AAR_LIBRARIES:=
LOCAL_STATIC_JAVA_LIBRARIES:=
LOCAL_STATIC_LIBRARIES:=
+LOCAL_STRIP_DEX:=
LOCAL_STRIP_MODULE:=
LOCAL_SYSTEM_SHARED_LIBRARIES:=none
LOCAL_TARGET_REQUIRED_MODULES:=