diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index 42460ad..6aa3b42 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -86,20 +86,6 @@
 HOST_CORE_IMG_DEX_FILES   := $(foreach jar,$(HOST_CORE_IMG_JARS),  $(call intermediates-dir-for,JAVA_LIBRARIES,$(jar),t,COMMON)/javalib.jar)
 TARGET_CORE_IMG_DEX_FILES := $(foreach jar,$(TARGET_CORE_IMG_JARS),$(call intermediates-dir-for,JAVA_LIBRARIES,$(jar).com.android.art.testing, ,COMMON)/javalib.jar)
 
-# Jar files for the boot class path for testing. Must start with CORE_IMG_JARS.
-HOST_TEST_CORE_JARS   := $(addsuffix -hostdex,$(CORE_IMG_JARS)) conscrypt-hostdex
-HOST_CORE_DEX_LOCATIONS   := $(foreach jar,$(HOST_TEST_CORE_JARS),  $(HOST_OUT_JAVA_LIBRARIES)/$(jar).jar)
-ifeq ($(ART_TEST_ANDROID_ROOT),)
-TARGET_CORE_DEX_LOCATIONS := $(foreach jar,$(TARGET_CORE_IMG_JARS),/$(ART_DEXPREOPT_BOOT_JAR_DIR)/$(jar).jar)
-TARGET_CORE_DEX_LOCATIONS += /$(CONSCRYPT_DEXPREOPT_BOOT_JAR_DIR)/conscrypt.jar
-else
-TARGET_CORE_DEX_LOCATIONS := $(foreach jar,$(TARGET_CORE_IMG_JARS),$(ART_TEST_ANDROID_ROOT)/framework/$(jar).jar)
-TARGET_CORE_DEX_LOCATIONS += $(ART_TEST_ANDROID_ROOT)/framework/conscrypt.jar
-endif
-HOST_CORE_DEX_FILES   := $(foreach jar,$(HOST_TEST_CORE_JARS),  $(call intermediates-dir-for,JAVA_LIBRARIES,$(jar),t,COMMON)/javalib.jar)
-TARGET_CORE_DEX_FILES := $(foreach jar,$(TARGET_CORE_IMG_JARS), $(call intermediates-dir-for,JAVA_LIBRARIES,$(jar).com.android.art.testing, ,COMMON)/javalib.jar)
-TARGET_CORE_DEX_FILES += $(call intermediates-dir-for,JAVA_LIBRARIES,conscrypt.com.android.conscrypt, ,COMMON)/javalib.jar
-
 # Also copy the jar files next to host boot.art image.
 HOST_BOOT_IMAGE_JARS := $(foreach jar,$(CORE_IMG_JARS),$(HOST_OUT)/apex/com.android.art/javalib/$(jar).jar)
 $(HOST_BOOT_IMAGE_JARS): $(HOST_OUT)/apex/com.android.art/javalib/%.jar : $(HOST_OUT_JAVA_LIBRARIES)/%-hostdex.jar
@@ -108,6 +94,7 @@
 $(HOST_OUT)/apex/com.android.conscrypt/javalib/conscrypt.jar : $(HOST_OUT_JAVA_LIBRARIES)/conscrypt-hostdex.jar
 	$(copy-file-to-target)
 
+HOST_TEST_CORE_JARS   := $(addsuffix -hostdex,$(CORE_IMG_JARS) conscrypt)
 ART_HOST_DEX_DEPENDENCIES := $(foreach jar,$(HOST_TEST_CORE_JARS),$(HOST_OUT_JAVA_LIBRARIES)/$(jar).jar)
 ART_TARGET_DEX_DEPENDENCIES := com.android.art.testing com.android.conscrypt
 
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 998a8df..86e9494 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -493,7 +493,7 @@
   $$(call dist-for-goals,$$(gtest_rule),$$(gtest_output):gtest/$$(gtest_suffix))
   gtest_exe := $(2)
   # Dependencies for all host gtests.
-  gtest_deps := $$(HOST_CORE_DEX_LOCATIONS) \
+  gtest_deps := $$(ART_HOST_DEX_DEPENDENCIES) \
     $$(HOST_BOOT_IMAGE_JARS) \
     $$($(3)ART_HOST_OUT_SHARED_LIBRARIES)/libicu_jni$$(ART_HOST_SHLIB_EXTENSION) \
     $$($(3)ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$$(ART_HOST_SHLIB_EXTENSION) \
diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index c6fe400..638436a 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -79,9 +79,7 @@
 $$(core_image_name): PRIVATE_CORE_IMAGE_LOCATION := $$(core_image_location)
 $$(core_image_name): PRIVATE_CORE_IMG_NAME := $$(core_image_name)
 $$(core_image_name): PRIVATE_CORE_OAT_NAME := $$(core_oat_name)
-# In addition to the primary core image containing HOST_CORE_IMG_DEX_FILES,
-# also build a boot image extension for the remaining HOST_CORE_DEX_FILES.
-$$(core_image_name): $$(HOST_CORE_DEX_LOCATIONS) $$(core_dex2oat_dependency)
+$$(core_image_name): $$(HOST_CORE_IMG_DEX_LOCATIONS) $$(core_dex2oat_dependency)
 	@echo "host dex2oat: $$@"
 	@mkdir -p $$(dir $$@)
 	$$(hide) ANDROID_LOG_TAGS="*:e" $$(DEX2OAT) \
@@ -99,28 +97,6 @@
 	  --generate-debug-info --generate-build-id \
 	  --runtime-arg -XX:SlowDebug=true \
 	  --no-inline-from=core-oj-hostdex.jar \
-	  $$(PRIVATE_CORE_COMPILE_OPTIONS) && \
-	ANDROID_LOG_TAGS="*:e" $$(DEX2OAT) \
-	  --runtime-arg -Xms$(DEX2OAT_IMAGE_XMS) \
-	  --runtime-arg -Xmx$(DEX2OAT_IMAGE_XMX) \
-	  --runtime-arg -Xbootclasspath:$$(subst $$(space),:,$$(strip \
-	        $$(HOST_CORE_DEX_FILES))) \
-	  --runtime-arg -Xbootclasspath-locations:$$(subst $$(space),:,$$(strip \
-	        $$(HOST_CORE_DEX_LOCATIONS))) \
-	  $$(addprefix --dex-file=, \
-	      $$(filter-out $$(HOST_CORE_IMG_DEX_FILES),$$(HOST_CORE_DEX_FILES))) \
-	  $$(addprefix --dex-location=, \
-	      $$(filter-out $$(HOST_CORE_IMG_DEX_LOCATIONS),$$(HOST_CORE_DEX_LOCATIONS))) \
-	  --oat-file=$$(PRIVATE_CORE_OAT_NAME) \
-	  --oat-location=$$(PRIVATE_CORE_OAT_NAME) \
-	  --boot-image=$$(PRIVATE_CORE_IMAGE_LOCATION) \
-	  --image=$$(PRIVATE_CORE_IMG_NAME) \
-	  --instruction-set=$$($(2)ART_HOST_ARCH) \
-	  $$(LOCAL_$(2)DEX2OAT_HOST_INSTRUCTION_SET_FEATURES_OPTION) \
-	  --host --android-root=$$(HOST_OUT) \
-	  --generate-debug-info --generate-build-id \
-	  --runtime-arg -XX:SlowDebug=true \
-	  --no-inline-from=core-oj-hostdex.jar \
 	  $$(PRIVATE_CORE_COMPILE_OPTIONS)
 
 $$(core_oat_name): $$(core_image_name)
@@ -195,9 +171,7 @@
 $$(core_image_name): PRIVATE_CORE_IMAGE_LOCATION := $$(core_image_location)
 $$(core_image_name): PRIVATE_CORE_IMG_NAME := $$(core_image_name)
 $$(core_image_name): PRIVATE_CORE_OAT_NAME := $$(core_oat_name)
-# In addition to the primary core image containing TARGET_CORE_IMG_DEX_FILES,
-# also build a boot image extension for the remaining TARGET_CORE_DEX_FILES.
-$$(core_image_name): $$(TARGET_CORE_DEX_FILES) $$(core_dex2oat_dependency)
+$$(core_image_name): $$(TARGET_CORE_IMG_DEX_FILES) $$(core_dex2oat_dependency)
 	@echo "target dex2oat: $$@"
 	@mkdir -p $$(dir $$@)
 	$$(hide) $$(DEX2OAT) \
@@ -215,30 +189,7 @@
 	  --android-root=$$(PRODUCT_OUT)/system \
 	  --generate-debug-info --generate-build-id \
 	  --runtime-arg -XX:SlowDebug=true \
-	  $$(PRIVATE_CORE_COMPILE_OPTIONS) && \
-	$$(DEX2OAT) \
-	  --runtime-arg -Xms$(DEX2OAT_IMAGE_XMS) \
-	  --runtime-arg -Xmx$(DEX2OAT_IMAGE_XMX) \
-	  --runtime-arg -Xbootclasspath:$$(subst $$(space),:,$$(strip \
-	        $$(TARGET_CORE_DEX_FILES))) \
-	  --runtime-arg -Xbootclasspath-locations:$$(subst $$(space),:,$$(strip \
-	        $$(TARGET_CORE_DEX_LOCATIONS))) \
-	  $$(addprefix --dex-file=, \
-	       $$(filter-out $$(TARGET_CORE_IMG_DEX_FILES),$$(TARGET_CORE_DEX_FILES))) \
-	  $$(addprefix --dex-location=, \
-	       $$(filter-out $$(TARGET_CORE_IMG_DEX_LOCATIONS),$$(TARGET_CORE_DEX_LOCATIONS))) \
-	  --oat-file=$$(PRIVATE_CORE_OAT_NAME) \
-	  --oat-location=$$(PRIVATE_CORE_OAT_NAME) \
-	  --boot-image=$$(PRIVATE_CORE_IMAGE_LOCATION) \
-	  --image=$$(PRIVATE_CORE_IMG_NAME) \
-	  --instruction-set=$$($(2)TARGET_ARCH) \
-	  --instruction-set-variant=$$($(2)DEX2OAT_TARGET_CPU_VARIANT) \
-	  --instruction-set-features=$$($(2)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \
-	  --android-root=$$(PRODUCT_OUT)/system \
-	  --generate-debug-info --generate-build-id \
-	  --runtime-arg -XX:SlowDebug=true \
-	  $$(PRIVATE_CORE_COMPILE_OPTIONS) || \
-	(rm $$(PRIVATE_CORE_OAT_NAME); exit 1)
+	  $$(PRIVATE_CORE_COMPILE_OPTIONS)
 
 $$(core_oat_name): $$(core_image_name)
 
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 550ba30..85bd66f 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -71,7 +71,7 @@
   $(ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdkd$(ART_HOST_SHLIB_EXTENSION) \
   $(ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdkjvmti$(ART_HOST_SHLIB_EXTENSION) \
   $(ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdkjvmtid$(ART_HOST_SHLIB_EXTENSION) \
-  $(HOST_CORE_DEX_LOCATIONS) \
+  $(ART_HOST_DEX_DEPENDENCIES) \
 
 ifneq ($(HOST_PREFER_32_BIT),true)
 ART_TEST_HOST_RUN_TEST_DEPENDENCIES += \
diff --git a/tools/bootjars.sh b/tools/bootjars.sh
index 008e7ed..bb840b0 100755
--- a/tools/bootjars.sh
+++ b/tools/bootjars.sh
@@ -75,7 +75,7 @@
   # Note: This must start with the CORE_IMG_JARS in Android.common_path.mk
   # because that's what we use for compiling the core.art image.
   # It may contain additional modules from TEST_CORE_JARS.
-  core_jars_list="core-oj core-libart core-icu4j okhttp bouncycastle apache-xml conscrypt"
+  core_jars_list="core-oj core-libart core-icu4j okhttp bouncycastle apache-xml"
   core_jars_suffix=
   if [[ $mode == host ]]; then
     core_jars_suffix=-hostdex