diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta1/baseLibrary-2.2.0-beta1.jar b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta1/baseLibrary-2.2.0-beta1.jar
index f6e0263..bc644c3 100644
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta1/baseLibrary-2.2.0-beta1.jar
+++ b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-beta1/baseLibrary-2.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compiler/2.2.0-beta1/compiler-2.2.0-beta1.jar b/common/offline-m2/com/android/databinding/compiler/2.2.0-beta1/compiler-2.2.0-beta1.jar
index 949ab21..1a45ffa 100644
--- a/common/offline-m2/com/android/databinding/compiler/2.2.0-beta1/compiler-2.2.0-beta1.jar
+++ b/common/offline-m2/com/android/databinding/compiler/2.2.0-beta1/compiler-2.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compiler/2.2.0-beta1/compiler-2.2.0-beta1.pom b/common/offline-m2/com/android/databinding/compiler/2.2.0-beta1/compiler-2.2.0-beta1.pom
index 4d15d00..440c458 100644
--- a/common/offline-m2/com/android/databinding/compiler/2.2.0-beta1/compiler-2.2.0-beta1.pom
+++ b/common/offline-m2/com/android/databinding/compiler/2.2.0-beta1/compiler-2.2.0-beta1.pom
@@ -33,12 +33,6 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
@@ -51,6 +45,12 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>baseLibrary</artifactId>
+      <version>2.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
       <version>1.10</version>
@@ -64,7 +64,7 @@
     </dependency>
     <dependency>
       <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
+      <artifactId>compilerCommon</artifactId>
       <version>2.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta1/compilerCommon-2.2.0-beta1.jar b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta1/compilerCommon-2.2.0-beta1.jar
index e5e25ae..60aab09 100644
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta1/compilerCommon-2.2.0-beta1.jar
+++ b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta1/compilerCommon-2.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta1/compilerCommon-2.2.0-beta1.pom b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta1/compilerCommon-2.2.0-beta1.pom
index 39bc9ba..4eec72a 100644
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta1/compilerCommon-2.2.0-beta1.pom
+++ b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-beta1/compilerCommon-2.2.0-beta1.pom
@@ -57,16 +57,16 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.databinding</groupId>
       <artifactId>baseLibrary</artifactId>
       <version>2.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.4</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4/constraint-layout-solver-1.0.0-alpha4.jar b/common/offline-m2/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4/constraint-layout-solver-1.0.0-alpha4.jar
index 10bdbf0..60bc375 100644
--- a/common/offline-m2/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4/constraint-layout-solver-1.0.0-alpha4.jar
+++ b/common/offline-m2/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4/constraint-layout-solver-1.0.0-alpha4.jar
Binary files differ
diff --git a/common/offline-m2/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4/constraint-layout-solver-1.0.0-alpha4.jar.md5 b/common/offline-m2/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4/constraint-layout-solver-1.0.0-alpha4.jar.md5
index f58967f..0829bc6 100644
--- a/common/offline-m2/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4/constraint-layout-solver-1.0.0-alpha4.jar.md5
+++ b/common/offline-m2/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4/constraint-layout-solver-1.0.0-alpha4.jar.md5
@@ -1 +1 @@
-4748d407a5c48a70367c670d5b5ff2f9
\ No newline at end of file
+830530fc74de3892da845151039506a4
\ No newline at end of file
diff --git a/common/offline-m2/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4/constraint-layout-solver-1.0.0-alpha4.jar.sha1 b/common/offline-m2/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4/constraint-layout-solver-1.0.0-alpha4.jar.sha1
index 6e553aa..720022d 100644
--- a/common/offline-m2/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4/constraint-layout-solver-1.0.0-alpha4.jar.sha1
+++ b/common/offline-m2/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4/constraint-layout-solver-1.0.0-alpha4.jar.sha1
@@ -1 +1 @@
-181f2d21b10d80b77b7c36e4a940379a7f5a7c29
\ No newline at end of file
+bb2b4425cf2a80335279e5cacd9e05861413c4e3
\ No newline at end of file
diff --git a/common/offline-m2/com/android/support/constraint/constraint-layout-solver/maven-metadata.xml b/common/offline-m2/com/android/support/constraint/constraint-layout-solver/maven-metadata.xml
index 0f6a51e..eafa1bb 100644
--- a/common/offline-m2/com/android/support/constraint/constraint-layout-solver/maven-metadata.xml
+++ b/common/offline-m2/com/android/support/constraint/constraint-layout-solver/maven-metadata.xml
@@ -10,6 +10,6 @@
       <version>1.0.0-alpha3</version>
       <version>1.0.0-alpha4</version>
     </versions>
-    <lastUpdated>20160626174109</lastUpdated>
+    <lastUpdated>20160628170311</lastUpdated>
   </versioning>
 </metadata>
diff --git a/common/offline-m2/com/android/support/constraint/constraint-layout-solver/maven-metadata.xml.md5 b/common/offline-m2/com/android/support/constraint/constraint-layout-solver/maven-metadata.xml.md5
index aefcb01..9d46f35 100644
--- a/common/offline-m2/com/android/support/constraint/constraint-layout-solver/maven-metadata.xml.md5
+++ b/common/offline-m2/com/android/support/constraint/constraint-layout-solver/maven-metadata.xml.md5
@@ -1 +1 @@
-a887f95d9fb0733339946763e0c74046
\ No newline at end of file
+99a305ffdbb231fcbe4176abf30fbb8e
\ No newline at end of file
diff --git a/common/offline-m2/com/android/support/constraint/constraint-layout-solver/maven-metadata.xml.sha1 b/common/offline-m2/com/android/support/constraint/constraint-layout-solver/maven-metadata.xml.sha1
index 5ac0929..7e9458b 100644
--- a/common/offline-m2/com/android/support/constraint/constraint-layout-solver/maven-metadata.xml.sha1
+++ b/common/offline-m2/com/android/support/constraint/constraint-layout-solver/maven-metadata.xml.sha1
@@ -1 +1 @@
-1400ec322abd21871724bee51d88fca89c3da296
\ No newline at end of file
+600838ae73b769ec18800e211258efc482a931bd
\ No newline at end of file
diff --git a/common/offline-m2/com/android/support/constraint/constraint-layout/1.0.0-alpha4/constraint-layout-1.0.0-alpha4.aar b/common/offline-m2/com/android/support/constraint/constraint-layout/1.0.0-alpha4/constraint-layout-1.0.0-alpha4.aar
index 837c69c..f4cb488 100644
--- a/common/offline-m2/com/android/support/constraint/constraint-layout/1.0.0-alpha4/constraint-layout-1.0.0-alpha4.aar
+++ b/common/offline-m2/com/android/support/constraint/constraint-layout/1.0.0-alpha4/constraint-layout-1.0.0-alpha4.aar
Binary files differ
diff --git a/common/offline-m2/com/android/support/constraint/constraint-layout/1.0.0-alpha4/constraint-layout-1.0.0-alpha4.aar.md5 b/common/offline-m2/com/android/support/constraint/constraint-layout/1.0.0-alpha4/constraint-layout-1.0.0-alpha4.aar.md5
index ba4baa2..604c90a 100644
--- a/common/offline-m2/com/android/support/constraint/constraint-layout/1.0.0-alpha4/constraint-layout-1.0.0-alpha4.aar.md5
+++ b/common/offline-m2/com/android/support/constraint/constraint-layout/1.0.0-alpha4/constraint-layout-1.0.0-alpha4.aar.md5
@@ -1 +1 @@
-0b6eb33a7562e298866699f84f49cfcb
\ No newline at end of file
+2333f4f5f9e09b6b20a94a075744111c
\ No newline at end of file
diff --git a/common/offline-m2/com/android/support/constraint/constraint-layout/1.0.0-alpha4/constraint-layout-1.0.0-alpha4.aar.sha1 b/common/offline-m2/com/android/support/constraint/constraint-layout/1.0.0-alpha4/constraint-layout-1.0.0-alpha4.aar.sha1
index d461b2e..9c4b5fe 100644
--- a/common/offline-m2/com/android/support/constraint/constraint-layout/1.0.0-alpha4/constraint-layout-1.0.0-alpha4.aar.sha1
+++ b/common/offline-m2/com/android/support/constraint/constraint-layout/1.0.0-alpha4/constraint-layout-1.0.0-alpha4.aar.sha1
@@ -1 +1 @@
-741f3863eda276f59c1d4b07d4878a0ba5122fa2
\ No newline at end of file
+6a1ac0584aef465f30cac367a3b4a91eb66c0473
\ No newline at end of file
diff --git a/common/offline-m2/com/android/support/constraint/constraint-layout/maven-metadata.xml b/common/offline-m2/com/android/support/constraint/constraint-layout/maven-metadata.xml
index 396cddd..2cf0aae 100644
--- a/common/offline-m2/com/android/support/constraint/constraint-layout/maven-metadata.xml
+++ b/common/offline-m2/com/android/support/constraint/constraint-layout/maven-metadata.xml
@@ -10,6 +10,6 @@
       <version>1.0.0-alpha3</version>
       <version>1.0.0-alpha4</version>
     </versions>
-    <lastUpdated>20160626174109</lastUpdated>
+    <lastUpdated>20160628170311</lastUpdated>
   </versioning>
 </metadata>
diff --git a/common/offline-m2/com/android/support/constraint/constraint-layout/maven-metadata.xml.md5 b/common/offline-m2/com/android/support/constraint/constraint-layout/maven-metadata.xml.md5
index 40e3d98..1f23b4f 100644
--- a/common/offline-m2/com/android/support/constraint/constraint-layout/maven-metadata.xml.md5
+++ b/common/offline-m2/com/android/support/constraint/constraint-layout/maven-metadata.xml.md5
@@ -1 +1 @@
-965b33c40eef57c71cf08101ad2b63fe
\ No newline at end of file
+f9ec9628bd38a5c4018d7fa038229d59
\ No newline at end of file
diff --git a/common/offline-m2/com/android/support/constraint/constraint-layout/maven-metadata.xml.sha1 b/common/offline-m2/com/android/support/constraint/constraint-layout/maven-metadata.xml.sha1
index b4544a0..aa16e03 100644
--- a/common/offline-m2/com/android/support/constraint/constraint-layout/maven-metadata.xml.sha1
+++ b/common/offline-m2/com/android/support/constraint/constraint-layout/maven-metadata.xml.sha1
@@ -1 +1 @@
-bdeb1e6b31b4af8a44994fefe3e18e30b5cddccc
\ No newline at end of file
+53fcd84bee0347ed434ad74e9ace18e91dd02337
\ No newline at end of file
diff --git a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta1/protos-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta1/protos-25.2.0-beta1.jar
new file mode 100644
index 0000000..df30bc5
--- /dev/null
+++ b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta1/protos-25.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta1/protos-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta1/protos-25.2.0-beta1.pom
new file mode 100644
index 0000000..1d023dc
--- /dev/null
+++ b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-beta1/protos-25.2.0-beta1.pom
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.android.tools.analytics-library</groupId>
+  <artifactId>protos</artifactId>
+  <version>25.2.0-beta1</version>
+  <name>Android Tools Analytics Protobufs</name>
+  <description>Library containing protobufs for usage analytics.</description>
+  <url>http://tools.android.com</url>
+  <inceptionYear>2007</inceptionYear>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>The Android Open Source Project</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
+    <url>https://android.googlesource.com/platform/tools/base</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>2.5.0</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta1/shared-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta1/shared-25.2.0-beta1.jar
new file mode 100644
index 0000000..df4a755
--- /dev/null
+++ b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta1/shared-25.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta1/shared-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta1/shared-25.2.0-beta1.pom
new file mode 100644
index 0000000..7e20650
--- /dev/null
+++ b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-beta1/shared-25.2.0-beta1.pom
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.android.tools.analytics-library</groupId>
+  <artifactId>shared</artifactId>
+  <version>25.2.0-beta1</version>
+  <name>Android Tools Analytics Shared Library</name>
+  <description>Helper Library for tracking usage analytics.</description>
+  <url>http://tools.android.com</url>
+  <inceptionYear>2007</inceptionYear>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>The Android Open Source Project</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>git://android.googlesource.com/platform/tools/base.git</connection>
+    <url>https://android.googlesource.com/platform/tools/base</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>17.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.analytics-library</groupId>
+      <artifactId>protos</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>0.28</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>annotations</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.2.4</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta1/tracker-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta1/tracker-25.2.0-beta1.jar
index 9fbbf22..6fd9a3b 100644
--- a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta1/tracker-25.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta1/tracker-25.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta1/tracker-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta1/tracker-25.2.0-beta1.pom
index 6075f0c..55c4383 100644
--- a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta1/tracker-25.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-beta1/tracker-25.2.0-beta1.pom
@@ -45,20 +45,20 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.analytics-library</groupId>
+      <artifactId>protos</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
       <version>0.28</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>analytics-shared</artifactId>
+      <artifactId>shared</artifactId>
       <version>25.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
@@ -70,15 +70,15 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
+      <artifactId>annotations</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
       <artifactId>testutils</artifactId>
       <version>25.2.0-beta1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>analytics-protos</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/annotations/25.2.0-beta1/annotations-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/annotations/25.2.0-beta1/annotations-25.2.0-beta1.jar
index 6600529..bd3475d 100644
--- a/common/offline-m2/com/android/tools/annotations/25.2.0-beta1/annotations-25.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/annotations/25.2.0-beta1/annotations-25.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta1/builder-model-2.2.0-beta1.jar b/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta1/builder-model-2.2.0-beta1.jar
index 9b92a9e..bb9f814 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta1/builder-model-2.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/builder-model/2.2.0-beta1/builder-model-2.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta1/builder-test-api-2.2.0-beta1.jar b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta1/builder-test-api-2.2.0-beta1.jar
index eca872d..c33e976 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta1/builder-test-api-2.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta1/builder-test-api-2.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta1/builder-test-api-2.2.0-beta1.pom b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta1/builder-test-api-2.2.0-beta1.pom
index 469980a..539a5f0 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta1/builder-test-api-2.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-beta1/builder-test-api-2.2.0-beta1.pom
@@ -27,16 +27,16 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.android.tools.ddms</groupId>
+      <artifactId>ddmlib</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/build/builder/2.2.0-beta1/builder-2.2.0-beta1.jar b/common/offline-m2/com/android/tools/build/builder/2.2.0-beta1/builder-2.2.0-beta1.jar
index c1afc04..2eac47b 100644
--- a/common/offline-m2/com/android/tools/build/builder/2.2.0-beta1/builder-2.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/builder/2.2.0-beta1/builder-2.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder/2.2.0-beta1/builder-2.2.0-beta1.pom b/common/offline-m2/com/android/tools/build/builder/2.2.0-beta1/builder-2.2.0-beta1.pom
index ec5658c..8f1c68f 100644
--- a/common/offline-m2/com/android/tools/build/builder/2.2.0-beta1/builder-2.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/build/builder/2.2.0-beta1/builder-2.2.0-beta1.pom
@@ -27,8 +27,8 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdk-common</artifactId>
       <version>25.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
@@ -39,24 +39,12 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
       <version>5.0.4</version>
@@ -64,47 +52,65 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.jill</groupId>
-      <artifactId>jill-api</artifactId>
-      <version>0.10.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-tree</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>manifest-merger</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
       <artifactId>builder-model</artifactId>
       <version>2.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
+      <artifactId>common</artifactId>
       <version>25.2.0-beta1</version>
-      <scope>test</scope>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.ddms</groupId>
+      <artifactId>ddmlib</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>analytics-protos</artifactId>
+      <artifactId>protos</artifactId>
       <version>25.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-tree</artifactId>
+      <version>5.0.4</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.jill</groupId>
+      <artifactId>jill-api</artifactId>
+      <version>0.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.analytics-library</groupId>
+      <artifactId>shared</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>manifest-merger</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-test-api</artifactId>
+      <version>2.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.jack</groupId>
+      <artifactId>jack-api</artifactId>
+      <version>0.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
       <version>0.28</version>
@@ -118,13 +124,7 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>analytics-shared</artifactId>
+      <artifactId>sdklib</artifactId>
       <version>25.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
@@ -135,18 +135,18 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.jack</groupId>
-      <artifactId>jack-api</artifactId>
-      <version>0.10.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
       <version>1.48</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.9.5</version>
diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta1/gradle-api-2.2.0-beta1.jar b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta1/gradle-api-2.2.0-beta1.jar
index 891f457..86ad9e5 100644
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta1/gradle-api-2.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-beta1/gradle-api-2.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta1/gradle-core-2.2.0-beta1.jar b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta1/gradle-core-2.2.0-beta1.jar
index e180028..b76e5ff 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta1/gradle-core-2.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta1/gradle-core-2.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta1/gradle-core-2.2.0-beta1.pom b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta1/gradle-core-2.2.0-beta1.pom
index 2ea40eb..81fd53e 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta1/gradle-core-2.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-beta1/gradle-core-2.2.0-beta1.pom
@@ -27,18 +27,18 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.jsoup</groupId>
       <artifactId>jsoup</artifactId>
       <version>1.6.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>tools.base.instant-run</groupId>
+      <artifactId>instant-run-runtime</artifactId>
+      <version>unspecified</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
@@ -57,10 +57,10 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>transform-api</artifactId>
-      <version>2.0.0-deprecated-use-gradle-api</version>
-      <scope>compile</scope>
+      <groupId>tools.base</groupId>
+      <artifactId>project-test-lib</artifactId>
+      <version>unspecified</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jacoco</groupId>
@@ -69,20 +69,8 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-annotations</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-runtime</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder</artifactId>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>compilerCommon</artifactId>
       <version>2.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
@@ -93,21 +81,15 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
+      <groupId>tools.base.instant-run</groupId>
+      <artifactId>instant-run-annotations</artifactId>
       <version>unspecified</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.2.0-beta1</version>
+      <groupId>com.android.tools.lint</groupId>
+      <artifactId>lint</artifactId>
+      <version>25.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -124,7 +106,7 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-api</artifactId>
+      <artifactId>builder</artifactId>
       <version>2.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
@@ -147,6 +129,24 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>gradle-api</artifactId>
+      <version>2.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>transform-api</artifactId>
+      <version>2.0.0-deprecated-use-gradle-api</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.9.5</version>
diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta1/gradle-experimental-0.8.0-beta1.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta1/gradle-experimental-0.8.0-beta1.jar
index 07b901c..2dbebcb 100644
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta1/gradle-experimental-0.8.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta1/gradle-experimental-0.8.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta1/gradle-experimental-0.8.0-beta1.pom b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta1/gradle-experimental-0.8.0-beta1.pom
index 81799e6..e611afd 100644
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta1/gradle-experimental-0.8.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-beta1/gradle-experimental-0.8.0-beta1.pom
@@ -27,9 +27,9 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -39,9 +39,9 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <groupId>tools.base</groupId>
+      <artifactId>project-test-lib</artifactId>
+      <version>unspecified</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta1/gradle-2.2.0-beta1.jar b/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta1/gradle-2.2.0-beta1.jar
index c3a6d9e..1127e63 100644
--- a/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta1/gradle-2.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta1/gradle-2.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta1/gradle-2.2.0-beta1.pom b/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta1/gradle-2.2.0-beta1.pom
index a2bd372..a21c8c9 100644
--- a/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta1/gradle-2.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/build/gradle/2.2.0-beta1/gradle-2.2.0-beta1.pom
@@ -27,9 +27,9 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -39,16 +39,16 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
       <version>0.28</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>tools.base</groupId>
+      <artifactId>project-test-lib</artifactId>
+      <version>unspecified</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta1/manifest-merger-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta1/manifest-merger-25.2.0-beta1.jar
index 847c437..d665e6f 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta1/manifest-merger-25.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta1/manifest-merger-25.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta1/manifest-merger-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta1/manifest-merger-25.2.0-beta1.pom
index 42cfae0..740e196 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta1/manifest-merger-25.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-beta1/manifest-merger-25.2.0-beta1.pom
@@ -28,7 +28,7 @@
   <dependencies>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
+      <artifactId>sdk-common</artifactId>
       <version>25.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
@@ -52,7 +52,7 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
+      <artifactId>sdklib</artifactId>
       <version>25.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
diff --git a/common/offline-m2/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.jar b/common/offline-m2/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.jar
index e242825..97ef4a5 100644
--- a/common/offline-m2/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.jar
+++ b/common/offline-m2/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/common/25.2.0-beta1/common-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/common/25.2.0-beta1/common-25.2.0-beta1.jar
index 9ba3834..69638af 100644
--- a/common/offline-m2/com/android/tools/common/25.2.0-beta1/common-25.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/common/25.2.0-beta1/common-25.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta1/ddmlib-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta1/ddmlib-25.2.0-beta1.jar
index 6627c52..89d9641 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta1/ddmlib-25.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta1/ddmlib-25.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/dvlib/25.2.0-beta1/dvlib-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/dvlib/25.2.0-beta1/dvlib-25.2.0-beta1.jar
index a79c64a..c572a3c 100644
--- a/common/offline-m2/com/android/tools/dvlib/25.2.0-beta1/dvlib-25.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/dvlib/25.2.0-beta1/dvlib-25.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/jack/jack-api/0.10.0/jack-api-0.10.0.jar b/common/offline-m2/com/android/tools/jack/jack-api/0.10.0/jack-api-0.10.0.jar
index 69c9cd9..cd26f53 100644
--- a/common/offline-m2/com/android/tools/jack/jack-api/0.10.0/jack-api-0.10.0.jar
+++ b/common/offline-m2/com/android/tools/jack/jack-api/0.10.0/jack-api-0.10.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/jill/jill-api/0.10.0/jill-api-0.10.0.jar b/common/offline-m2/com/android/tools/jill/jill-api/0.10.0/jill-api-0.10.0.jar
index fff22dd..540604d 100644
--- a/common/offline-m2/com/android/tools/jill/jill-api/0.10.0/jill-api-0.10.0.jar
+++ b/common/offline-m2/com/android/tools/jill/jill-api/0.10.0/jill-api-0.10.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta1/layoutlib-api-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta1/layoutlib-api-25.2.0-beta1.jar
index a98cdb5..26211b8 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta1/layoutlib-api-25.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta1/layoutlib-api-25.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta1/lint-api-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta1/lint-api-25.2.0-beta1.jar
index 05dca51..3c5dcc1 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta1/lint-api-25.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta1/lint-api-25.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta1/lint-api-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta1/lint-api-25.2.0-beta1.pom
index 6f99a74..96d67b1 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta1/lint-api-25.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-beta1/lint-api-25.2.0-beta1.pom
@@ -27,12 +27,24 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdk-common</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
       <version>5.0.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-model</artifactId>
+      <version>2.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.android.tools.external.lombok</groupId>
       <artifactId>lombok-ast</artifactId>
       <version>0.2.3</version>
@@ -45,18 +57,6 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools.external.com-intellij</groupId>
       <artifactId>uast</artifactId>
       <version>145.597.3</version>
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta1/lint-checks-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta1/lint-checks-25.2.0-beta1.jar
index 3aa0157..2af3dcd 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta1/lint-checks-25.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta1/lint-checks-25.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta1/lint-checks-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta1/lint-checks-25.2.0-beta1.pom
index 68d7fb6..fc2f032 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta1/lint-checks-25.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-beta1/lint-checks-25.2.0-beta1.pom
@@ -27,16 +27,16 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-api</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-analysis</artifactId>
       <version>5.0.4</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.android.tools.lint</groupId>
+      <artifactId>lint-api</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta1/lint-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta1/lint-25.2.0-beta1.jar
index e527fee..3de1c9e 100644
--- a/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta1/lint-25.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/lint/lint/25.2.0-beta1/lint-25.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/repository/25.2.0-beta1/repository-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/repository/25.2.0-beta1/repository-25.2.0-beta1.jar
index d121c1e..cb005be 100644
--- a/common/offline-m2/com/android/tools/repository/25.2.0-beta1/repository-25.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/repository/25.2.0-beta1/repository-25.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta1/sdk-common-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta1/sdk-common-25.2.0-beta1.jar
index c117fbe..7b7ba9a 100644
--- a/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta1/sdk-common-25.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta1/sdk-common-25.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta1/sdk-common-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta1/sdk-common-25.2.0-beta1.pom
index 317cc52..70275fc 100644
--- a/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta1/sdk-common-25.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/sdk-common/25.2.0-beta1/sdk-common-25.2.0-beta1.pom
@@ -27,9 +27,9 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-beta1</version>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-test-api</artifactId>
+      <version>2.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -40,7 +40,7 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
+      <artifactId>builder-model</artifactId>
       <version>2.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
@@ -51,9 +51,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-beta1</version>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdklib</artifactId>
+      <version>25.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/offline-m2/com/android/tools/sdklib/25.2.0-beta1/sdklib-25.2.0-beta1.jar b/common/offline-m2/com/android/tools/sdklib/25.2.0-beta1/sdklib-25.2.0-beta1.jar
index 96f8c50..c791be3 100644
--- a/common/offline-m2/com/android/tools/sdklib/25.2.0-beta1/sdklib-25.2.0-beta1.jar
+++ b/common/offline-m2/com/android/tools/sdklib/25.2.0-beta1/sdklib-25.2.0-beta1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdklib/25.2.0-beta1/sdklib-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/sdklib/25.2.0-beta1/sdklib-25.2.0-beta1.pom
index d71172e..1b0ef4e 100644
--- a/common/offline-m2/com/android/tools/sdklib/25.2.0-beta1/sdklib-25.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/sdklib/25.2.0-beta1/sdklib-25.2.0-beta1.pom
@@ -51,12 +51,6 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>dvlib</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
       <version>2.2.4</version>
@@ -74,5 +68,11 @@
       <version>4.1</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>dvlib</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>