diff --git a/CleanSpec.mk b/CleanSpec.mk
index 63d6f66..76711f2 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -432,6 +432,10 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/sbin/adbd)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/sbin/adbd)
 
+# Soong linux -> linux_glibc rename
+$(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -name 'linux_x86*' | xargs rm -rf)
+$(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -name 'linux_common*' | xargs rm -rf)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/core/combo/javac.mk b/core/combo/javac.mk
index cb034e9..41ebc57 100644
--- a/core/combo/javac.mk
+++ b/core/combo/javac.mk
@@ -8,14 +8,7 @@
 #   ANDROID_JAVA_TOOLCHAIN -- Directory that contains javac and other java tools
 #
 
-ifndef ANDROID_COMPILE_WITH_JACK
-    # TODO(b/64113890, b/35788202): remove PRODUCT_COMPILE_WITH_JACK
-    ifdef PRODUCT_COMPILE_WITH_JACK
-        ANDROID_COMPILE_WITH_JACK := $(PRODUCT_COMPILE_WITH_JACK)
-    else
-        ANDROID_COMPILE_WITH_JACK := false
-    endif
-endif
+ANDROID_COMPILE_WITH_JACK := false
 
 ifdef TARGET_BUILD_APPS
   ifndef TURBINE_ENABLED
diff --git a/target/product/base.mk b/target/product/base.mk
index 9dd48b7..0e3647d 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -153,16 +153,16 @@
     sqlite3
 
 PRODUCT_COPY_FILES := $(call add-to-product-copy-files-if-exists,\
-    frameworks/base/preloaded-classes:system/etc/preloaded-classes)
+    frameworks/base/config/preloaded-classes:system/etc/preloaded-classes)
 
 # Note: it is acceptable to not have a compiled-classes file. In that case, all boot classpath
 #       classes will be compiled.
 PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
-    frameworks/base/compiled-classes:system/etc/compiled-classes)
+    frameworks/base/config/compiled-classes:system/etc/compiled-classes)
 
 # Note: it is acceptable to not have a dirty-image-objects file. In that case, the special bin
 #       for known dirty objects in the image will be empty.
 PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
-    frameworks/base/dirty-image-objects:system/etc/dirty-image-objects)
+    frameworks/base/config/dirty-image-objects:system/etc/dirty-image-objects)
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/embedded.mk)
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index a9a288a..523df7a 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -144,7 +144,7 @@
 
 # Enable boot.oat filtering of compiled classes to reduce boot.oat size. b/28026683
 PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
-    frameworks/base/compiled-classes-phone:system/etc/compiled-classes)
+    frameworks/base/config/compiled-classes-phone:system/etc/compiled-classes)
 
 # Enable dirty image object binning to reduce dirty pages in the image.
 PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\