diff --git a/build/Android.mk b/build/Android.mk
index bb85dd926..379f21d31 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -91,8 +91,8 @@ ALL_SDK_FILES += $(android_jar_src_target)
 # ====================================================
 
 # The Jack & Jill compiler jars
-ALL_SDK_FILES += $(HOST_OUT)/framework/jack.jar
-ALL_SDK_FILES += $(HOST_OUT)/framework/jill.jar
+ALL_SDK_FILES += prebuilts/sdk/tools/jacks/jack-$(JACK_SDKTOOL_VERSION).jar
+ALL_SDK_FILES += prebuilts/sdk/tools/jills/jill-$(JACK_SDKTOOL_VERSION).jar
 
 # The uiautomator stubs
 ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_uiautomator_intermediates/javalib.jar
diff --git a/build/sdk.atree b/build/sdk.atree
index a65038678..865d028b9 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -139,8 +139,8 @@ prebuilts/sdk/tools/lib/shrinkedAndroid.jar   build-tools/${PLATFORM_NAME}/lib/s
 dalvik/dx/etc/mainDexClasses.rules            build-tools/${PLATFORM_NAME}/mainDexClasses.rules
 
 # Jack & Jill
-${HOST_OUT}/framework/jack.jar                build-tools/${PLATFORM_NAME}/jack.jar
-${HOST_OUT}/framework/jill.jar                build-tools/${PLATFORM_NAME}/jill.jar
+prebuilts/sdk/tools/jacks/jack-${JACK_SDKTOOL_VERSION}.jar                build-tools/${PLATFORM_NAME}/jack.jar
+prebuilts/sdk/tools/jills/jill-${JACK_SDKTOOL_VERSION}.jar                build-tools/${PLATFORM_NAME}/jill.jar
 
 
 ##############################################################################