diff --git a/common/android-support-test/Android.mk b/common/android-support-test/Android.mk
index 59beac0..902ac94 100644
--- a/common/android-support-test/Android.mk
+++ b/common/android-support-test/Android.mk
@@ -14,23 +14,96 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-# for Andoird JUnit runner
+# for Android JUnit runner and rules
 include $(CLEAR_VARS)
-
 LOCAL_MODULE := android-support-test
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := android-support-test.jar
+LOCAL_SRC_FILES := rules/rules-0.2-release.jar
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
-
 include $(BUILD_PREBUILT)
 
-# for espresso
+include $(CLEAR_VARS)
+LOCAL_MODULE := android-support-test-nodep
+LOCAL_SDK_VERSION := 21
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test-rules-nodep android-support-test-runner-nodep
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android-support-test-rules-nodep
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := rules/rules-0.2-release-no-dep.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := android-support-test-runner-nodep
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := runner/runner-0.2-release-no-dep.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+include $(BUILD_PREBUILT)
+
+# for espresso-core
+## Note: the following jar already contains android-support-test
 include $(CLEAR_VARS)
 LOCAL_MODULE := espresso-core
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := espresso-core.jar
+LOCAL_SRC_FILES := espresso/espresso-core-2.1-release.jar
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := espresso-core-nodep
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := espresso/espresso-core-2.1-release-no-dep.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+include $(BUILD_PREBUILT)
+
+# for espresso-contrib
+## Note: the following jar already contains espresso-core
+include $(CLEAR_VARS)
+LOCAL_MODULE := espresso-contrib
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := espresso/espresso-contrib-2.1-release.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := espresso-contrib-nodep
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := espresso/espresso-contrib-2.1-release-no-dep.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+include $(BUILD_PREBUILT)
+
+# for espresso-idling-resource
+include $(CLEAR_VARS)
+LOCAL_MODULE := espresso-idling-resource-nodep
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := espresso/espresso-idling-resource-2.1-release-no-dep.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+include $(BUILD_PREBUILT)
+
+# for espresso-intents
+## Note: the following jar already contains espresso-core
+include $(CLEAR_VARS)
+LOCAL_MODULE := espresso-intents
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := espresso/espresso-intents-2.1-release.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := espresso-intents-nodep
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := espresso/espresso-intents-2.1-release-no-dep.jar
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)
 include $(BUILD_PREBUILT)
diff --git a/common/android-support-test/PREBUILT b/common/android-support-test/PREBUILT
index df341c1..07386da 100644
--- a/common/android-support-test/PREBUILT
+++ b/common/android-support-test/PREBUILT
@@ -1,4 +1,4 @@
 The object in this prebuilt directory can be rebuilt from
-	platform/frameworks/testing/support
+	platform/frameworks/testing/support on ub-support-test branch
 
-From the revision 21bf376aca8d2aa1ea8ed6fa8246f73a7837aa56
+From the revision dea2d2c8ce28636f4c77bfd0158891489fd3110f
diff --git a/common/android-support-test/android-support-test.jar b/common/android-support-test/android-support-test.jar
deleted file mode 100644
index 8ac3990..0000000
--- a/common/android-support-test/android-support-test.jar
+++ /dev/null
Binary files differ
diff --git a/common/android-support-test/build.gradle b/common/android-support-test/build.gradle
index c39c0b3..ba2f4bd 100644
--- a/common/android-support-test/build.gradle
+++ b/common/android-support-test/build.gradle
@@ -1,13 +1,28 @@
-// To use the "android-support-test.jar" add the following dependency:
+/*
+ * WARNING: This file is deprecated! it’s here for legacy purposes only.
+ * All Android Testing Libraries should be used from the Android Maven repository,
+ * the same way you would use the Support Libraries.
+ *
+ * If you're compiling against current and the prerelease versions of the Support Libraries
+ * (using Jars in "prebuilts/sdk/current/support") then you should explicitly exclude your
+ * "support-annotations" dependency.
+ *
+ * An example of how to configure your project can be found here:
+ * go/config-atsl-deps (https://bit.googleplex.com/#/nkorsote/5894271450218496)
+ */
+
+// To use the test runner and test rules add the following dependency:
 //     compile project(":android-support-test")
+// where "android-support-test" is the name you defined in your settings.gradle file
 if (!configurations.findByName("default")) {
     configurations.create("default")
 }
-artifacts.add("default", file("android-support-test.jar"))
+artifacts.add("default", file("runner/runner-0.2-release.jar"))
+artifacts.add("default", file("rules/rules-0.2-release.jar"))
 
 // To use the "android-support-test.jar" and the "esspresso-core.jar" add the following dependency:
 //     compile project(path: ":android-support-test", configuration: "espresso-core")
 if (!configurations.findByName("espresso-core")) {
     configurations.create("espresso-core")
 }
-artifacts.add("espresso-core", file("espresso-core.jar"))
+artifacts.add("espresso-core", file("espresso/espresso-core-2.1-release.jar"))
diff --git a/common/android-support-test/espresso-core.jar b/common/android-support-test/espresso-core.jar
deleted file mode 100644
index 1a71c31..0000000
--- a/common/android-support-test/espresso-core.jar
+++ /dev/null
Binary files differ
diff --git a/common/android-support-test/espresso/espresso-contrib-2.1-release-no-dep.jar b/common/android-support-test/espresso/espresso-contrib-2.1-release-no-dep.jar
new file mode 100644
index 0000000..6fa028d
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-contrib-2.1-release-no-dep.jar
Binary files differ
diff --git a/common/android-support-test/espresso/espresso-contrib-2.1-release.jar b/common/android-support-test/espresso/espresso-contrib-2.1-release.jar
new file mode 100644
index 0000000..b6ef693
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-contrib-2.1-release.jar
Binary files differ
diff --git a/common/android-support-test/espresso/espresso-core-2.1-release-no-dep.jar b/common/android-support-test/espresso/espresso-core-2.1-release-no-dep.jar
new file mode 100644
index 0000000..0c6f9df
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-core-2.1-release-no-dep.jar
Binary files differ
diff --git a/common/android-support-test/espresso/espresso-core-2.1-release.jar b/common/android-support-test/espresso/espresso-core-2.1-release.jar
new file mode 100644
index 0000000..c3b4c36
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-core-2.1-release.jar
Binary files differ
diff --git a/common/android-support-test/espresso/espresso-idling-resource-2.1-release-no-dep.jar b/common/android-support-test/espresso/espresso-idling-resource-2.1-release-no-dep.jar
new file mode 100644
index 0000000..87c0d3a
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-idling-resource-2.1-release-no-dep.jar
Binary files differ
diff --git a/common/android-support-test/espresso/espresso-intents-2.1-release-no-dep.jar b/common/android-support-test/espresso/espresso-intents-2.1-release-no-dep.jar
new file mode 100644
index 0000000..82d4966
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-intents-2.1-release-no-dep.jar
Binary files differ
diff --git a/common/android-support-test/espresso/espresso-intents-2.1-release.jar b/common/android-support-test/espresso/espresso-intents-2.1-release.jar
new file mode 100644
index 0000000..ff3def0
--- /dev/null
+++ b/common/android-support-test/espresso/espresso-intents-2.1-release.jar
Binary files differ
diff --git a/common/android-support-test/rules/rules-0.2-release-no-dep.jar b/common/android-support-test/rules/rules-0.2-release-no-dep.jar
new file mode 100644
index 0000000..5c64a93
--- /dev/null
+++ b/common/android-support-test/rules/rules-0.2-release-no-dep.jar
Binary files differ
diff --git a/common/android-support-test/rules/rules-0.2-release.jar b/common/android-support-test/rules/rules-0.2-release.jar
new file mode 100644
index 0000000..e8dd840
--- /dev/null
+++ b/common/android-support-test/rules/rules-0.2-release.jar
Binary files differ
diff --git a/common/android-support-test/runner/runner-0.2-release-no-dep.jar b/common/android-support-test/runner/runner-0.2-release-no-dep.jar
new file mode 100644
index 0000000..ac85eb5
--- /dev/null
+++ b/common/android-support-test/runner/runner-0.2-release-no-dep.jar
Binary files differ
diff --git a/common/android-support-test/runner/runner-0.2-release.jar b/common/android-support-test/runner/runner-0.2-release.jar
new file mode 100644
index 0000000..8f76158
--- /dev/null
+++ b/common/android-support-test/runner/runner-0.2-release.jar
Binary files differ