diff --git a/build/Android.mk b/build/Android.mk
index 319d22521..c647ecd91 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -89,6 +89,8 @@ ALL_SDK_FILES += $(android_jar_src_target)
 
 # ====================================================
 
+# multidex jack library
+ALL_SDK_FILES += $(call intermediates-dir-for, JAVA_LIBRARIES,android-support-multidex,,COMMON)/classes.jack
 # The Jack & Jill compiler jars
 ALL_SDK_FILES += prebuilts/sdk/tools/jacks/jack-$(JACK_SDKTOOL_VERSION).jar
 ALL_SDK_FILES += prebuilts/sdk/tools/jills/jill-$(JACK_SDKTOOL_VERSION).jar
diff --git a/build/sdk.atree b/build/sdk.atree
index da0baa815..5333a93e8 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -489,6 +489,7 @@ frameworks/multidex/library/project.properties
 frameworks/multidex/library/src/.readme                                                           extras/android/support/multidex/library/src/.readme
 frameworks/multidex/library/res/.readme                                                           extras/android/support/multidex/library/res/.readme
 ${OUT_DIR}/target/common/obj/PACKAGING/android-support-multidex_intermediates/android-support-multidex.jar              extras/android/support/multidex/library/libs/android-support-multidex.jar
+${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android-support-multidex_intermediates/classes.jack                         extras/android/support/multidex/library/libs/android-support-multidex.jack
 
 frameworks/multidex/instrumentation/README.txt                                                         extras/android/support/multidex/instrumentation/README.txt
 frameworks/multidex/instrumentation/.project                                                           extras/android/support/multidex/instrumentation/.project
@@ -499,6 +500,7 @@ frameworks/multidex/instrumentation/src/.readme
 frameworks/multidex/instrumentation/res/.readme                                                        extras/android/support/multidex/instrumentation/res/.readme
 ${OUT_DIR}/target/common/obj/PACKAGING/android-support-multidex-instrumentation_intermediates/android-support-multidex-instrumentation.jar      extras/android/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
 ${OUT_DIR}/target/common/obj/PACKAGING/android-support-multidex_intermediates/android-support-multidex.jar                                      extras/android/support/multidex/instrumentation/libs/android-support-multidex.jar
+${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android-support-multidex_intermediates/classes.jack                                                 extras/android/support/multidex/instrumentation/libs/android-support-multidex.jack
 
 frameworks/support/v7/mediarouter/README.txt                                                       extras/android/support/v7/mediarouter/README.txt
 frameworks/support/v7/mediarouter/.project                                                         extras/android/support/v7/mediarouter/.project