diff --git a/common/offline-m2/com/android/tools/build/builder-model/0.14.4/builder-model-0.14.4-sources.jar b/common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc1/builder-model-1.0.0-rc1-sources.jar
similarity index 81%
rename from common/offline-m2/com/android/tools/build/builder-model/0.14.4/builder-model-0.14.4-sources.jar
rename to common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc1/builder-model-1.0.0-rc1-sources.jar
index e5b526d..7709558 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/0.14.4/builder-model-0.14.4-sources.jar
+++ b/common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc1/builder-model-1.0.0-rc1-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-model/0.14.4/builder-model-0.14.4.jar b/common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc1/builder-model-1.0.0-rc1.jar
similarity index 74%
rename from common/offline-m2/com/android/tools/build/builder-model/0.14.4/builder-model-0.14.4.jar
rename to common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc1/builder-model-1.0.0-rc1.jar
index b47dc0c..9398236 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/0.14.4/builder-model-0.14.4.jar
+++ b/common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc1/builder-model-1.0.0-rc1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-model/0.14.4/builder-model-0.14.4.pom b/common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc1/builder-model-1.0.0-rc1.pom
similarity index 89%
rename from common/offline-m2/com/android/tools/build/builder-model/0.14.4/builder-model-0.14.4.pom
rename to common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc1/builder-model-1.0.0-rc1.pom
index 57f58c0..ca246eb 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/0.14.4/builder-model-0.14.4.pom
+++ b/common/offline-m2/com/android/tools/build/builder-model/1.0.0-rc1/builder-model-1.0.0-rc1.pom
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder-model</artifactId>
-  <version>0.14.4</version>
+  <version>1.0.0-rc1</version>
   <dependencies>
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>common</artifactId>
-      <version>23.2.4</version>
+      <version>23.2.5</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/0.14.4/builder-test-api-0.14.4-sources.jar b/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc1/builder-test-api-1.0.0-rc1-sources.jar
similarity index 72%
rename from common/offline-m2/com/android/tools/build/builder-test-api/0.14.4/builder-test-api-0.14.4-sources.jar
rename to common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc1/builder-test-api-1.0.0-rc1-sources.jar
index 4e0bc33..d4242a9 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/0.14.4/builder-test-api-0.14.4-sources.jar
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc1/builder-test-api-1.0.0-rc1-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/0.14.4/builder-test-api-0.14.4.jar b/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc1/builder-test-api-1.0.0-rc1.jar
similarity index 60%
rename from common/offline-m2/com/android/tools/build/builder-test-api/0.14.4/builder-test-api-0.14.4.jar
rename to common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc1/builder-test-api-1.0.0-rc1.jar
index 9bb6124..73391ea 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/0.14.4/builder-test-api-0.14.4.jar
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc1/builder-test-api-1.0.0-rc1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/0.14.4/builder-test-api-0.14.4.pom b/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc1/builder-test-api-1.0.0-rc1.pom
similarity index 89%
rename from common/offline-m2/com/android/tools/build/builder-test-api/0.14.4/builder-test-api-0.14.4.pom
rename to common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc1/builder-test-api-1.0.0-rc1.pom
index 16f8d26..5811814 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/0.14.4/builder-test-api-0.14.4.pom
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/1.0.0-rc1/builder-test-api-1.0.0-rc1.pom
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder-test-api</artifactId>
-  <version>0.14.4</version>
+  <version>1.0.0-rc1</version>
   <dependencies>
     <dependency>
       <groupId>com.android.tools.ddms</groupId>
       <artifactId>ddmlib</artifactId>
-      <version>23.2.4</version>
+      <version>23.2.5</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/build/builder/0.14.4/builder-0.14.4-sources.jar b/common/offline-m2/com/android/tools/build/builder/1.0.0-rc1/builder-1.0.0-rc1-sources.jar
similarity index 78%
rename from common/offline-m2/com/android/tools/build/builder/0.14.4/builder-0.14.4-sources.jar
rename to common/offline-m2/com/android/tools/build/builder/1.0.0-rc1/builder-1.0.0-rc1-sources.jar
index f88bcb0..de2c40e 100644
--- a/common/offline-m2/com/android/tools/build/builder/0.14.4/builder-0.14.4-sources.jar
+++ b/common/offline-m2/com/android/tools/build/builder/1.0.0-rc1/builder-1.0.0-rc1-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder/0.14.4/builder-0.14.4.jar b/common/offline-m2/com/android/tools/build/builder/1.0.0-rc1/builder-1.0.0-rc1.jar
similarity index 78%
rename from common/offline-m2/com/android/tools/build/builder/0.14.4/builder-0.14.4.jar
rename to common/offline-m2/com/android/tools/build/builder/1.0.0-rc1/builder-1.0.0-rc1.jar
index 70f1e2b..03f177c 100644
--- a/common/offline-m2/com/android/tools/build/builder/0.14.4/builder-0.14.4.jar
+++ b/common/offline-m2/com/android/tools/build/builder/1.0.0-rc1/builder-1.0.0-rc1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder/0.14.4/builder-0.14.4.pom b/common/offline-m2/com/android/tools/build/builder/1.0.0-rc1/builder-1.0.0-rc1.pom
similarity index 88%
rename from common/offline-m2/com/android/tools/build/builder/0.14.4/builder-0.14.4.pom
rename to common/offline-m2/com/android/tools/build/builder/1.0.0-rc1/builder-1.0.0-rc1.pom
index 28be272..257626a 100644
--- a/common/offline-m2/com/android/tools/build/builder/0.14.4/builder-0.14.4.pom
+++ b/common/offline-m2/com/android/tools/build/builder/1.0.0-rc1/builder-1.0.0-rc1.pom
@@ -4,18 +4,24 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder</artifactId>
-  <version>0.14.4</version>
+  <version>1.0.0-rc1</version>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>23.2.4</version>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>23.2.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>23.2.4</version>
+      <artifactId>sdklib</artifactId>
+      <version>23.2.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.ddms</groupId>
+      <artifactId>ddmlib</artifactId>
+      <version>23.2.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -33,7 +39,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdk-common</artifactId>
-      <version>23.2.4</version>
+      <version>23.2.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -45,28 +51,22 @@
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>builder-test-api</artifactId>
-      <version>0.14.4</version>
+      <version>1.0.0-rc1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>23.2.4</version>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>manifest-merger</artifactId>
+      <version>23.2.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>testutils</artifactId>
-      <version>23.2.4</version>
+      <version>23.2.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>0.14.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
@@ -74,8 +74,8 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools.build</groupId>
-      <artifactId>manifest-merger</artifactId>
-      <version>23.2.4</version>
+      <artifactId>builder-model</artifactId>
+      <version>1.0.0-rc1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/offline-m2/com/android/tools/build/gradle/0.14.4/gradle-0.14.4.jar b/common/offline-m2/com/android/tools/build/gradle/0.14.4/gradle-0.14.4.jar
deleted file mode 100644
index 287140f..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/0.14.4/gradle-0.14.4.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/0.14.4/gradle-0.14.4-sources.jar b/common/offline-m2/com/android/tools/build/gradle/1.0.0-rc1/gradle-1.0.0-rc1-sources.jar
similarity index 72%
rename from common/offline-m2/com/android/tools/build/gradle/0.14.4/gradle-0.14.4-sources.jar
rename to common/offline-m2/com/android/tools/build/gradle/1.0.0-rc1/gradle-1.0.0-rc1-sources.jar
index 7de2f54..df34965 100644
--- a/common/offline-m2/com/android/tools/build/gradle/0.14.4/gradle-0.14.4-sources.jar
+++ b/common/offline-m2/com/android/tools/build/gradle/1.0.0-rc1/gradle-1.0.0-rc1-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/1.0.0-rc1/gradle-1.0.0-rc1.jar b/common/offline-m2/com/android/tools/build/gradle/1.0.0-rc1/gradle-1.0.0-rc1.jar
new file mode 100644
index 0000000..4a71eed
--- /dev/null
+++ b/common/offline-m2/com/android/tools/build/gradle/1.0.0-rc1/gradle-1.0.0-rc1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/0.14.4/gradle-0.14.4.pom b/common/offline-m2/com/android/tools/build/gradle/1.0.0-rc1/gradle-1.0.0-rc1.pom
similarity index 92%
rename from common/offline-m2/com/android/tools/build/gradle/0.14.4/gradle-0.14.4.pom
rename to common/offline-m2/com/android/tools/build/gradle/1.0.0-rc1/gradle-1.0.0-rc1.pom
index 34c898b..e9bc39b 100644
--- a/common/offline-m2/com/android/tools/build/gradle/0.14.4/gradle-0.14.4.pom
+++ b/common/offline-m2/com/android/tools/build/gradle/1.0.0-rc1/gradle-1.0.0-rc1.pom
@@ -4,9 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>gradle</artifactId>
-  <version>0.14.4</version>
+  <version>1.0.0-rc1</version>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools.lint</groupId>
+      <artifactId>lint</artifactId>
+      <version>23.2.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
@@ -15,13 +21,7 @@
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>builder</artifactId>
-      <version>0.14.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint</artifactId>
-      <version>23.2.4</version>
+      <version>1.0.0-rc1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/23.2.4/manifest-merger-23.2.4-sources.jar b/common/offline-m2/com/android/tools/build/manifest-merger/23.2.5/manifest-merger-23.2.5-sources.jar
similarity index 89%
rename from common/offline-m2/com/android/tools/build/manifest-merger/23.2.4/manifest-merger-23.2.4-sources.jar
rename to common/offline-m2/com/android/tools/build/manifest-merger/23.2.5/manifest-merger-23.2.5-sources.jar
index d2346b5..bb95e19 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/23.2.4/manifest-merger-23.2.4-sources.jar
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/23.2.5/manifest-merger-23.2.5-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/23.2.4/manifest-merger-23.2.4.jar b/common/offline-m2/com/android/tools/build/manifest-merger/23.2.5/manifest-merger-23.2.5.jar
similarity index 88%
rename from common/offline-m2/com/android/tools/build/manifest-merger/23.2.4/manifest-merger-23.2.4.jar
rename to common/offline-m2/com/android/tools/build/manifest-merger/23.2.5/manifest-merger-23.2.5.jar
index 03552d7..6a1ab67 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/23.2.4/manifest-merger-23.2.4.jar
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/23.2.5/manifest-merger-23.2.5.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/23.2.4/manifest-merger-23.2.4.pom b/common/offline-m2/com/android/tools/build/manifest-merger/23.2.5/manifest-merger-23.2.5.pom
similarity index 91%
rename from common/offline-m2/com/android/tools/build/manifest-merger/23.2.4/manifest-merger-23.2.4.pom
rename to common/offline-m2/com/android/tools/build/manifest-merger/23.2.5/manifest-merger-23.2.5.pom
index fe825b0..7d150af 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/23.2.4/manifest-merger-23.2.4.pom
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/23.2.5/manifest-merger-23.2.5.pom
@@ -4,24 +4,24 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>manifest-merger</artifactId>
-  <version>23.2.4</version>
+  <version>23.2.5</version>
   <dependencies>
     <dependency>
-      <groupId>net.sf.kxml</groupId>
-      <artifactId>kxml2</artifactId>
-      <version>2.3.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>common</artifactId>
-      <version>23.2.4</version>
+      <version>23.2.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdklib</artifactId>
-      <version>23.2.4</version>
+      <version>23.2.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.kxml</groupId>
+      <artifactId>kxml2</artifactId>
+      <version>2.3.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdk-common</artifactId>
-      <version>23.2.4</version>
+      <version>23.2.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/offline-m2/com/android/tools/common/23.2.4/common-23.2.4-sources.jar b/common/offline-m2/com/android/tools/common/23.2.5/common-23.2.5-sources.jar
similarity index 91%
rename from common/offline-m2/com/android/tools/common/23.2.4/common-23.2.4-sources.jar
rename to common/offline-m2/com/android/tools/common/23.2.5/common-23.2.5-sources.jar
index 3cc6b85..31bc755 100644
--- a/common/offline-m2/com/android/tools/common/23.2.4/common-23.2.4-sources.jar
+++ b/common/offline-m2/com/android/tools/common/23.2.5/common-23.2.5-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/common/23.2.4/common-23.2.4.jar b/common/offline-m2/com/android/tools/common/23.2.5/common-23.2.5.jar
similarity index 84%
rename from common/offline-m2/com/android/tools/common/23.2.4/common-23.2.4.jar
rename to common/offline-m2/com/android/tools/common/23.2.5/common-23.2.5.jar
index e9902da..9f7efa9 100644
--- a/common/offline-m2/com/android/tools/common/23.2.4/common-23.2.4.jar
+++ b/common/offline-m2/com/android/tools/common/23.2.5/common-23.2.5.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/common/23.2.4/common-23.2.4.pom b/common/offline-m2/com/android/tools/common/23.2.5/common-23.2.5.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/common/23.2.4/common-23.2.4.pom
rename to common/offline-m2/com/android/tools/common/23.2.5/common-23.2.5.pom
index 8b848ad..14b03aa 100644
--- a/common/offline-m2/com/android/tools/common/23.2.4/common-23.2.4.pom
+++ b/common/offline-m2/com/android/tools/common/23.2.5/common-23.2.5.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>common</artifactId>
-  <version>23.2.4</version>
+  <version>23.2.5</version>
   <dependencies>
     <dependency>
       <groupId>com.google.guava</groupId>
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.4/ddmlib-23.2.4-sources.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.5/ddmlib-23.2.5-sources.jar
similarity index 93%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/23.2.4/ddmlib-23.2.4-sources.jar
rename to common/offline-m2/com/android/tools/ddms/ddmlib/23.2.5/ddmlib-23.2.5-sources.jar
index df839fb..b73da3c 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.4/ddmlib-23.2.4-sources.jar
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.5/ddmlib-23.2.5-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.4/ddmlib-23.2.4.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.5/ddmlib-23.2.5.jar
similarity index 87%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/23.2.4/ddmlib-23.2.4.jar
rename to common/offline-m2/com/android/tools/ddms/ddmlib/23.2.5/ddmlib-23.2.5.jar
index 3cc2b50..42c82fb 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.4/ddmlib-23.2.4.jar
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.5/ddmlib-23.2.5.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.4/ddmlib-23.2.4.pom b/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.5/ddmlib-23.2.5.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/23.2.4/ddmlib-23.2.4.pom
rename to common/offline-m2/com/android/tools/ddms/ddmlib/23.2.5/ddmlib-23.2.5.pom
index b57471c..3602165 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.4/ddmlib-23.2.4.pom
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/23.2.5/ddmlib-23.2.5.pom
@@ -4,21 +4,21 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.ddms</groupId>
   <artifactId>ddmlib</artifactId>
-  <version>23.2.4</version>
+  <version>23.2.5</version>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>23.2.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>net.sf.kxml</groupId>
       <artifactId>kxml2</artifactId>
       <version>2.3.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>23.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
diff --git a/common/offline-m2/com/android/tools/dvlib/23.2.4/dvlib-23.2.4-sources.jar b/common/offline-m2/com/android/tools/dvlib/23.2.5/dvlib-23.2.5-sources.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/dvlib/23.2.4/dvlib-23.2.4-sources.jar
rename to common/offline-m2/com/android/tools/dvlib/23.2.5/dvlib-23.2.5-sources.jar
index d6ce532..e56bfb3 100644
--- a/common/offline-m2/com/android/tools/dvlib/23.2.4/dvlib-23.2.4-sources.jar
+++ b/common/offline-m2/com/android/tools/dvlib/23.2.5/dvlib-23.2.5-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/dvlib/23.2.4/dvlib-23.2.4.jar b/common/offline-m2/com/android/tools/dvlib/23.2.5/dvlib-23.2.5.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/dvlib/23.2.4/dvlib-23.2.4.jar
rename to common/offline-m2/com/android/tools/dvlib/23.2.5/dvlib-23.2.5.jar
index a10f1f5..951e8d8 100644
--- a/common/offline-m2/com/android/tools/dvlib/23.2.4/dvlib-23.2.4.jar
+++ b/common/offline-m2/com/android/tools/dvlib/23.2.5/dvlib-23.2.5.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/dvlib/23.2.4/dvlib-23.2.4.pom b/common/offline-m2/com/android/tools/dvlib/23.2.5/dvlib-23.2.5.pom
similarity index 91%
rename from common/offline-m2/com/android/tools/dvlib/23.2.4/dvlib-23.2.4.pom
rename to common/offline-m2/com/android/tools/dvlib/23.2.5/dvlib-23.2.5.pom
index a2849d9..30fb567 100644
--- a/common/offline-m2/com/android/tools/dvlib/23.2.4/dvlib-23.2.4.pom
+++ b/common/offline-m2/com/android/tools/dvlib/23.2.5/dvlib-23.2.5.pom
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>dvlib</artifactId>
-  <version>23.2.4</version>
+  <version>23.2.5</version>
   <dependencies>
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>common</artifactId>
-      <version>23.2.4</version>
+      <version>23.2.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.4/layoutlib-api-23.2.4-sources.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.5/layoutlib-api-23.2.5-sources.jar
similarity index 88%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.4/layoutlib-api-23.2.4-sources.jar
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.5/layoutlib-api-23.2.5-sources.jar
index 1dbaffc..09aca67 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.4/layoutlib-api-23.2.4-sources.jar
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.5/layoutlib-api-23.2.5-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.4/layoutlib-api-23.2.4.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.5/layoutlib-api-23.2.5.jar
similarity index 87%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.4/layoutlib-api-23.2.4.jar
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.5/layoutlib-api-23.2.5.jar
index f19ecc2..fe1d731 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.4/layoutlib-api-23.2.4.jar
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.5/layoutlib-api-23.2.5.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.4/layoutlib-api-23.2.4.pom b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.5/layoutlib-api-23.2.5.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.4/layoutlib-api-23.2.4.pom
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.5/layoutlib-api-23.2.5.pom
index d597572..871a35b 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.4/layoutlib-api-23.2.4.pom
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/23.2.5/layoutlib-api-23.2.5.pom
@@ -4,21 +4,21 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.layoutlib</groupId>
   <artifactId>layoutlib-api</artifactId>
-  <version>23.2.4</version>
+  <version>23.2.5</version>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>23.2.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>net.sf.kxml</groupId>
       <artifactId>kxml2</artifactId>
       <version>2.3.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>23.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/23.2.4/lint-api-23.2.4-sources.jar b/common/offline-m2/com/android/tools/lint/lint-api/23.2.5/lint-api-23.2.5-sources.jar
similarity index 95%
rename from common/offline-m2/com/android/tools/lint/lint-api/23.2.4/lint-api-23.2.4-sources.jar
rename to common/offline-m2/com/android/tools/lint/lint-api/23.2.5/lint-api-23.2.5-sources.jar
index 7cb4758..a764306 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/23.2.4/lint-api-23.2.4-sources.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-api/23.2.5/lint-api-23.2.5-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/23.2.4/lint-api-23.2.4.jar b/common/offline-m2/com/android/tools/lint/lint-api/23.2.5/lint-api-23.2.5.jar
similarity index 93%
rename from common/offline-m2/com/android/tools/lint/lint-api/23.2.4/lint-api-23.2.4.jar
rename to common/offline-m2/com/android/tools/lint/lint-api/23.2.5/lint-api-23.2.5.jar
index 5585350..9f4fe20 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/23.2.4/lint-api-23.2.4.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-api/23.2.5/lint-api-23.2.5.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/23.2.4/lint-api-23.2.4.pom b/common/offline-m2/com/android/tools/lint/lint-api/23.2.5/lint-api-23.2.5.pom
similarity index 92%
rename from common/offline-m2/com/android/tools/lint/lint-api/23.2.4/lint-api-23.2.4.pom
rename to common/offline-m2/com/android/tools/lint/lint-api/23.2.5/lint-api-23.2.5.pom
index f529572..dcd54d1 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/23.2.4/lint-api-23.2.4.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-api/23.2.5/lint-api-23.2.5.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint-api</artifactId>
-  <version>23.2.4</version>
+  <version>23.2.5</version>
   <dependencies>
     <dependency>
       <groupId>org.ow2.asm</groupId>
@@ -19,12 +19,6 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>0.14.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-tree</artifactId>
       <version>4.0</version>
@@ -33,7 +27,13 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdk-common</artifactId>
-      <version>23.2.4</version>
+      <version>23.2.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-model</artifactId>
+      <version>1.0.0-rc1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/23.2.4/lint-checks-23.2.4-sources.jar b/common/offline-m2/com/android/tools/lint/lint-checks/23.2.5/lint-checks-23.2.5-sources.jar
similarity index 93%
rename from common/offline-m2/com/android/tools/lint/lint-checks/23.2.4/lint-checks-23.2.4-sources.jar
rename to common/offline-m2/com/android/tools/lint/lint-checks/23.2.5/lint-checks-23.2.5-sources.jar
index 0bb89eb..6a3cec7 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/23.2.4/lint-checks-23.2.4-sources.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/23.2.5/lint-checks-23.2.5-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/23.2.4/lint-checks-23.2.4.jar b/common/offline-m2/com/android/tools/lint/lint-checks/23.2.5/lint-checks-23.2.5.jar
similarity index 92%
rename from common/offline-m2/com/android/tools/lint/lint-checks/23.2.4/lint-checks-23.2.4.jar
rename to common/offline-m2/com/android/tools/lint/lint-checks/23.2.5/lint-checks-23.2.5.jar
index 7108ed8..821af2c 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/23.2.4/lint-checks-23.2.4.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/23.2.5/lint-checks-23.2.5.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/23.2.4/lint-checks-23.2.4.pom b/common/offline-m2/com/android/tools/lint/lint-checks/23.2.5/lint-checks-23.2.5.pom
similarity index 92%
rename from common/offline-m2/com/android/tools/lint/lint-checks/23.2.4/lint-checks-23.2.4.pom
rename to common/offline-m2/com/android/tools/lint/lint-checks/23.2.5/lint-checks-23.2.5.pom
index 7b56cc6..820ac94 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/23.2.4/lint-checks-23.2.4.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/23.2.5/lint-checks-23.2.5.pom
@@ -4,24 +4,24 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint-checks</artifactId>
-  <version>23.2.4</version>
+  <version>23.2.5</version>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>23.2.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>23.2.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>com.android.tools.lint</groupId>
       <artifactId>lint-api</artifactId>
-      <version>23.2.4</version>
+      <version>23.2.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/offline-m2/com/android/tools/lint/lint/23.2.4/lint-23.2.4-sources.jar b/common/offline-m2/com/android/tools/lint/lint/23.2.5/lint-23.2.5-sources.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint/23.2.4/lint-23.2.4-sources.jar
rename to common/offline-m2/com/android/tools/lint/lint/23.2.5/lint-23.2.5-sources.jar
index 0b6c65a..110d0c6 100644
--- a/common/offline-m2/com/android/tools/lint/lint/23.2.4/lint-23.2.4-sources.jar
+++ b/common/offline-m2/com/android/tools/lint/lint/23.2.5/lint-23.2.5-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint/23.2.4/lint-23.2.4.jar b/common/offline-m2/com/android/tools/lint/lint/23.2.5/lint-23.2.5.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint/23.2.4/lint-23.2.4.jar
rename to common/offline-m2/com/android/tools/lint/lint/23.2.5/lint-23.2.5.jar
index 099a687..a4bb424 100644
--- a/common/offline-m2/com/android/tools/lint/lint/23.2.4/lint-23.2.4.jar
+++ b/common/offline-m2/com/android/tools/lint/lint/23.2.5/lint-23.2.5.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint/23.2.4/lint-23.2.4.pom b/common/offline-m2/com/android/tools/lint/lint/23.2.5/lint-23.2.5.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/lint/lint/23.2.4/lint-23.2.4.pom
rename to common/offline-m2/com/android/tools/lint/lint/23.2.5/lint-23.2.5.pom
index c2b8db8..3a8841c 100644
--- a/common/offline-m2/com/android/tools/lint/lint/23.2.4/lint-23.2.4.pom
+++ b/common/offline-m2/com/android/tools/lint/lint/23.2.5/lint-23.2.5.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint</artifactId>
-  <version>23.2.4</version>
+  <version>23.2.5</version>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
@@ -13,28 +13,28 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>23.2.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.eclipse.jdt.core.compiler</groupId>
       <artifactId>ecj</artifactId>
       <version>4.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.lint</groupId>
+      <artifactId>lint-checks</artifactId>
+      <version>23.2.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-checks</artifactId>
-      <version>23.2.4</version>
-      <scope>compile</scope>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>23.2.5</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
diff --git a/common/offline-m2/com/android/tools/sdk-common/23.2.4/sdk-common-23.2.4-sources.jar b/common/offline-m2/com/android/tools/sdk-common/23.2.5/sdk-common-23.2.5-sources.jar
similarity index 93%
rename from common/offline-m2/com/android/tools/sdk-common/23.2.4/sdk-common-23.2.4-sources.jar
rename to common/offline-m2/com/android/tools/sdk-common/23.2.5/sdk-common-23.2.5-sources.jar
index bc03240..57a9650 100644
--- a/common/offline-m2/com/android/tools/sdk-common/23.2.4/sdk-common-23.2.4-sources.jar
+++ b/common/offline-m2/com/android/tools/sdk-common/23.2.5/sdk-common-23.2.5-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdk-common/23.2.4/sdk-common-23.2.4.jar b/common/offline-m2/com/android/tools/sdk-common/23.2.5/sdk-common-23.2.5.jar
similarity index 92%
rename from common/offline-m2/com/android/tools/sdk-common/23.2.4/sdk-common-23.2.4.jar
rename to common/offline-m2/com/android/tools/sdk-common/23.2.5/sdk-common-23.2.5.jar
index 534f718..26fe57f 100644
--- a/common/offline-m2/com/android/tools/sdk-common/23.2.4/sdk-common-23.2.4.jar
+++ b/common/offline-m2/com/android/tools/sdk-common/23.2.5/sdk-common-23.2.5.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdk-common/23.2.4/sdk-common-23.2.4.pom b/common/offline-m2/com/android/tools/sdk-common/23.2.5/sdk-common-23.2.5.pom
similarity index 88%
rename from common/offline-m2/com/android/tools/sdk-common/23.2.4/sdk-common-23.2.4.pom
rename to common/offline-m2/com/android/tools/sdk-common/23.2.5/sdk-common-23.2.5.pom
index a682d2c..dc0e2f7 100644
--- a/common/offline-m2/com/android/tools/sdk-common/23.2.4/sdk-common-23.2.4.pom
+++ b/common/offline-m2/com/android/tools/sdk-common/23.2.5/sdk-common-23.2.5.pom
@@ -4,31 +4,31 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>sdk-common</artifactId>
-  <version>23.2.4</version>
+  <version>23.2.5</version>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>0.14.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdklib</artifactId>
-      <version>23.2.4</version>
+      <version>23.2.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>23.2.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>23.2.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-test-api</artifactId>
+      <version>1.0.0-rc1</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/sdklib/23.2.4/sdklib-23.2.4-sources.jar b/common/offline-m2/com/android/tools/sdklib/23.2.5/sdklib-23.2.5-sources.jar
similarity index 93%
rename from common/offline-m2/com/android/tools/sdklib/23.2.4/sdklib-23.2.4-sources.jar
rename to common/offline-m2/com/android/tools/sdklib/23.2.5/sdklib-23.2.5-sources.jar
index 155794f..67ca52e 100644
--- a/common/offline-m2/com/android/tools/sdklib/23.2.4/sdklib-23.2.4-sources.jar
+++ b/common/offline-m2/com/android/tools/sdklib/23.2.5/sdklib-23.2.5-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdklib/23.2.4/sdklib-23.2.4.jar b/common/offline-m2/com/android/tools/sdklib/23.2.5/sdklib-23.2.5.jar
similarity index 92%
rename from common/offline-m2/com/android/tools/sdklib/23.2.4/sdklib-23.2.4.jar
rename to common/offline-m2/com/android/tools/sdklib/23.2.5/sdklib-23.2.5.jar
index 0509b3d..24772d8 100644
--- a/common/offline-m2/com/android/tools/sdklib/23.2.4/sdklib-23.2.4.jar
+++ b/common/offline-m2/com/android/tools/sdklib/23.2.5/sdklib-23.2.5.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdklib/23.2.4/sdklib-23.2.4.pom b/common/offline-m2/com/android/tools/sdklib/23.2.5/sdklib-23.2.5.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/sdklib/23.2.4/sdklib-23.2.4.pom
rename to common/offline-m2/com/android/tools/sdklib/23.2.5/sdklib-23.2.5.pom
index d1a9f00..b70fd16 100644
--- a/common/offline-m2/com/android/tools/sdklib/23.2.4/sdklib-23.2.4.pom
+++ b/common/offline-m2/com/android/tools/sdklib/23.2.5/sdklib-23.2.5.pom
@@ -4,21 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>sdklib</artifactId>
-  <version>23.2.4</version>
+  <version>23.2.5</version>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>dvlib</artifactId>
-      <version>23.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.layoutlib</groupId>
-      <artifactId>layoutlib-api</artifactId>
-      <version>23.2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
       <version>4.1.1</version>
@@ -31,12 +19,24 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.layoutlib</groupId>
+      <artifactId>layoutlib-api</artifactId>
+      <version>23.2.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>dvlib</artifactId>
+      <version>23.2.5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
       <version>1.8.1</version>