diff --git a/build/Android.mk b/build/Android.mk
index 967242790..b66b7dd3f 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -101,6 +101,8 @@ $(android_jar_full_target): $(full_target)
 
 ALL_SDK_FILES += $(android_jar_full_target)
 
+# The uiautomator stubs
+ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_uiautomator_intermediates/javalib.jar
 
 # $(1): the Java library name
 define _package_sdk_library
diff --git a/build/sdk.atree b/build/sdk.atree
index 5727c06df..e0c25bad4 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -71,7 +71,7 @@ sdk/sdk-build.prop                            platforms/${PLATFORM_NAME}/build.p
 
 # the uper-jar file that apps link against. This is the public API
 ${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android.jar platforms/${PLATFORM_NAME}/android.jar
-${OUT_DIR}/target/product/generic/system/framework/uiautomator.jar           platforms/${PLATFORM_NAME}/uiautomator.jar
+${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/javalib.jar           platforms/${PLATFORM_NAME}/uiautomator.jar
 
 # the aidl precompiled include
 obj/framework.aidl platforms/${PLATFORM_NAME}/framework.aidl