diff --git a/build/Android.mk b/build/Android.mk
index 49e1bef82..e7243a536 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -104,9 +104,6 @@ ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.
 # core-lambda-stubs
 ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/core-lambda-stubs_intermediates/classes.jar
 
-# shrinkedAndroid.jar for multidex support
-ALL_SDK_FILES += $(HOST_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/shrinkedAndroid_intermediates/shrinkedAndroid.jar
-
 # ======= Lint API XML ===========
 full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_generated-api-versions.xml
 ALL_SDK_FILES += $(full_target)
diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree
index ba93c02ef..02480d571 100644
--- a/build/sdk-darwin-x86.atree
+++ b/build/sdk-darwin-x86.atree
@@ -46,8 +46,6 @@ prebuilts/sdk/tools/darwin/lld-bin/lld               strip build-tools/${PLATFOR
 prebuilts/sdk/tools/darwin/lib64/libc++.1.dylib      strip build-tools/${PLATFORM_NAME}/lib64/libc++.1.dylib
 prebuilts/sdk/tools/darwin/lib64/libc++abi.1.dylib   strip build-tools/${PLATFORM_NAME}/lib64/libc++abi.1.dylib
 
-dalvik/dx/etc/mainDexClasses                                build-tools/${PLATFORM_NAME}/mainDexClasses
-
 ##############################################################################
 # Docs Component
 ##############################################################################
diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree
index 477f33452..2f2726ee4 100644
--- a/build/sdk-linux-x86.atree
+++ b/build/sdk-linux-x86.atree
@@ -44,5 +44,3 @@ prebuilts/sdk/tools/lld-dummy  build-tools/${PLATFORM_NAME}/mipsel-linux-android
 prebuilts/sdk/tools/lld                              build-tools/${PLATFORM_NAME}/lld
 prebuilts/sdk/tools/linux/lld-bin/lld          strip build-tools/${PLATFORM_NAME}/lld-bin/lld
 prebuilts/sdk/tools/linux/lib64/libc++.so.1    strip build-tools/${PLATFORM_NAME}/lib64/libc++.so.1
-
-dalvik/dx/etc/mainDexClasses                               build-tools/${PLATFORM_NAME}/mainDexClasses
diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree
index f59ec34a0..dfc56684d 100644
--- a/build/sdk-windows-x86.atree
+++ b/build/sdk-windows-x86.atree
@@ -160,8 +160,6 @@ bin/lld.exe                                                 strip build-tools/${
 prebuilts/sdk/tools/windows/lld-bin/lld.exe                 strip build-tools/${PLATFORM_NAME}/lld-bin/lld.exe
 prebuilts/sdk/tools/windows/lld-bin/libwinpthread-1.dll     strip build-tools/${PLATFORM_NAME}/lld-bin/libwinpthread-1.dll
 
-dalvik/dx/etc/mainDexClasses.bat             build-tools/${PLATFORM_NAME}/mainDexClasses.bat
-
 
 ##############################################################################
 # Docs Component
diff --git a/build/sdk.atree b/build/sdk.atree
index 5862e5708..3870e8c4a 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -131,11 +131,6 @@ bin/dexdump                                   build-tools/${PLATFORM_NAME}/dexdu
 prebuilts/r8/r8.jar                           build-tools/${PLATFORM_NAME}/lib/d8.jar
 prebuilts/r8/d8                               build-tools/${PLATFORM_NAME}/d8
 
-# multi-dex
-${OUT_DIR}/host/common/obj/JAVA_LIBRARIES/shrinkedAndroid_intermediates/shrinkedAndroid.jar  build-tools/${PLATFORM_NAME}/lib/shrinkedAndroid.jar
-dalvik/dx/etc/mainDexClasses.rules                                                           build-tools/${PLATFORM_NAME}/mainDexClasses.rules
-dalvik/dx/etc/mainDexClassesNoAapt.rules                                                     build-tools/${PLATFORM_NAME}/mainDexClassesNoAapt.rules
-
 # Lambda stubs for use by javac
 ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/core-lambda-stubs_intermediates/classes.jar       build-tools/${PLATFORM_NAME}/core-lambda-stubs.jar