diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta6/baseLibrary-2.0.0-beta6.jar b/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta6/baseLibrary-2.0.0-beta6.jar
index 7b020e6..b4e061b 100644
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta6/baseLibrary-2.0.0-beta6.jar
+++ b/common/offline-m2/com/android/databinding/baseLibrary/2.0.0-beta6/baseLibrary-2.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compiler/2.0.0-beta6/compiler-2.0.0-beta6.jar b/common/offline-m2/com/android/databinding/compiler/2.0.0-beta6/compiler-2.0.0-beta6.jar
index 98792f3..4034c31 100644
--- a/common/offline-m2/com/android/databinding/compiler/2.0.0-beta6/compiler-2.0.0-beta6.jar
+++ b/common/offline-m2/com/android/databinding/compiler/2.0.0-beta6/compiler-2.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compiler/2.0.0-beta6/compiler-2.0.0-beta6.pom b/common/offline-m2/com/android/databinding/compiler/2.0.0-beta6/compiler-2.0.0-beta6.pom
index 6f5b1f1..dac1870 100644
--- a/common/offline-m2/com/android/databinding/compiler/2.0.0-beta6/compiler-2.0.0-beta6.pom
+++ b/common/offline-m2/com/android/databinding/compiler/2.0.0-beta6/compiler-2.0.0-beta6.pom
@@ -33,30 +33,30 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.10</version>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>baseLibrary</artifactId>
+      <version>2.0.0-beta6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
+      <artifactId>compilerCommon</artifactId>
       <version>2.0.0-beta6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.0.0-beta6</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.tunnelvisionlabs</groupId>
       <artifactId>antlr4</artifactId>
       <version>4.5</version>
diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta6/compilerCommon-2.0.0-beta6.jar b/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta6/compilerCommon-2.0.0-beta6.jar
index 3445db3..c7edb2a 100644
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta6/compilerCommon-2.0.0-beta6.jar
+++ b/common/offline-m2/com/android/databinding/compilerCommon/2.0.0-beta6/compilerCommon-2.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/annotations/25.0.0-beta6/annotations-25.0.0-beta6.jar b/common/offline-m2/com/android/tools/annotations/25.0.0-beta6/annotations-25.0.0-beta6.jar
index ba2cc8e..fbb28bc 100644
--- a/common/offline-m2/com/android/tools/annotations/25.0.0-beta6/annotations-25.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/annotations/25.0.0-beta6/annotations-25.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta6/builder-model-2.0.0-beta6.jar b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta6/builder-model-2.0.0-beta6.jar
index 0ff646b..43a88ca 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta6/builder-model-2.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-beta6/builder-model-2.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta6/builder-test-api-2.0.0-beta6.jar b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta6/builder-test-api-2.0.0-beta6.jar
index 46c7ab5..3110e38 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta6/builder-test-api-2.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta6/builder-test-api-2.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta6/builder-test-api-2.0.0-beta6.pom b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta6/builder-test-api-2.0.0-beta6.pom
index 27c6b85..3211140 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta6/builder-test-api-2.0.0-beta6.pom
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-beta6/builder-test-api-2.0.0-beta6.pom
@@ -27,16 +27,16 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.0.0-beta6</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.0.0-beta6</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/build/builder/2.0.0-beta6/builder-2.0.0-beta6.jar b/common/offline-m2/com/android/tools/build/builder/2.0.0-beta6/builder-2.0.0-beta6.jar
index bc933d2..99f2465 100644
--- a/common/offline-m2/com/android/tools/build/builder/2.0.0-beta6/builder-2.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/build/builder/2.0.0-beta6/builder-2.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder/2.0.0-beta6/builder-2.0.0-beta6.pom b/common/offline-m2/com/android/tools/build/builder/2.0.0-beta6/builder-2.0.0-beta6.pom
index c8b6fb0..a98f882 100644
--- a/common/offline-m2/com/android/tools/build/builder/2.0.0-beta6/builder-2.0.0-beta6.pom
+++ b/common/offline-m2/com/android/tools/build/builder/2.0.0-beta6/builder-2.0.0-beta6.pom
@@ -27,21 +27,21 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>builder-test-api</artifactId>
       <version>2.0.0-beta6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.0.0-beta6</version>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.jill</groupId>
+      <artifactId>jill-api</artifactId>
+      <version>0.9.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -58,9 +58,9 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
+      <artifactId>testutils</artifactId>
       <version>25.0.0-beta6</version>
-      <scope>compile</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.squareup</groupId>
@@ -69,12 +69,6 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.jack</groupId>
-      <artifactId>jack-api</artifactId>
-      <version>0.9.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>common</artifactId>
       <version>25.0.0-beta6</version>
@@ -87,32 +81,32 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.0.0-beta6</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.jill</groupId>
-      <artifactId>jill-api</artifactId>
-      <version>0.9.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
       <version>5.0.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdk-common</artifactId>
+      <version>25.0.0-beta6</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>manifest-merger</artifactId>
       <version>25.0.0-beta6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-model</artifactId>
+      <version>2.0.0-beta6</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
+      <artifactId>sdklib</artifactId>
       <version>25.0.0-beta6</version>
       <scope>compile</scope>
     </dependency>
@@ -123,15 +117,21 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.ddms</groupId>
+      <artifactId>ddmlib</artifactId>
+      <version>25.0.0-beta6</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.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.0.0-beta6</version>
+      <groupId>com.android.tools.jack</groupId>
+      <artifactId>jack-api</artifactId>
+      <version>0.9.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta6/gradle-api-2.0.0-beta6.jar b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta6/gradle-api-2.0.0-beta6.jar
index fcdc1a7..ab6ffa7 100644
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta6/gradle-api-2.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta6/gradle-api-2.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta6/gradle-api-2.0.0-beta6.pom b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta6/gradle-api-2.0.0-beta6.pom
index bada08d..5a25a90 100644
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta6/gradle-api-2.0.0-beta6.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-beta6/gradle-api-2.0.0-beta6.pom
@@ -33,16 +33,16 @@
       <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>annotations</artifactId>
       <version>25.0.0-beta6</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta6/gradle-core-2.0.0-beta6.jar b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta6/gradle-core-2.0.0-beta6.jar
index edbac42..eb93303 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta6/gradle-core-2.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta6/gradle-core-2.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta6/gradle-core-2.0.0-beta6.pom b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta6/gradle-core-2.0.0-beta6.pom
index fc04c43..70f3410 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta6/gradle-core-2.0.0-beta6.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-beta6/gradle-core-2.0.0-beta6.pom
@@ -39,16 +39,10 @@
       <scope>test</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>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>compilerCommon</artifactId>
+      <version>2.0.0-beta6</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
@@ -63,64 +57,70 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint</artifactId>
-      <version>25.0.0-beta6</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
+      <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>
-      <version>2.0.0-beta6</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
       <artifactId>gradle-api</artifactId>
       <version>2.0.0-beta6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.0.0-beta6</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sf.proguard</groupId>
-      <artifactId>proguard-gradle</artifactId>
-      <version>5.2.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>testutils</artifactId>
       <version>25.0.0-beta6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder</artifactId>
+      <version>2.0.0-beta6</version>
+      <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>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>5.0.3</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.sf.proguard</groupId>
+      <artifactId>proguard-gradle</artifactId>
+      <version>5.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.lint</groupId>
+      <artifactId>lint</artifactId>
+      <version>25.0.0-beta6</version>
+      <scope>compile</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/gradle-experimental/0.6.0-beta6/gradle-experimental-0.6.0-beta6.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta6/gradle-experimental-0.6.0-beta6.jar
index 061529a..f9f5d3a 100644
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta6/gradle-experimental-0.6.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-beta6/gradle-experimental-0.6.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta6/gradle-2.0.0-beta6.jar b/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta6/gradle-2.0.0-beta6.jar
index bca9563..07059cb 100644
--- a/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta6/gradle-2.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/build/gradle/2.0.0-beta6/gradle-2.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta6/manifest-merger-25.0.0-beta6.jar b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta6/manifest-merger-25.0.0-beta6.jar
index 8efd0ac..2cb0b95 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta6/manifest-merger-25.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta6/manifest-merger-25.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta6/manifest-merger-25.0.0-beta6.pom b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta6/manifest-merger-25.0.0-beta6.pom
index af72ad5..6124952 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta6/manifest-merger-25.0.0-beta6.pom
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-beta6/manifest-merger-25.0.0-beta6.pom
@@ -33,12 +33,6 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0-beta6</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.9.5</version>
@@ -52,7 +46,7 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
+      <artifactId>sdk-common</artifactId>
       <version>25.0.0-beta6</version>
       <scope>compile</scope>
     </dependency>
@@ -64,7 +58,13 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
+      <artifactId>sdklib</artifactId>
+      <version>25.0.0-beta6</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
       <version>25.0.0-beta6</version>
       <scope>compile</scope>
     </dependency>
diff --git a/common/offline-m2/com/android/tools/common/25.0.0-beta6/common-25.0.0-beta6.jar b/common/offline-m2/com/android/tools/common/25.0.0-beta6/common-25.0.0-beta6.jar
index 3d11378..3901632 100644
--- a/common/offline-m2/com/android/tools/common/25.0.0-beta6/common-25.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/common/25.0.0-beta6/common-25.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/common/25.0.0-beta6/common-25.0.0-beta6.pom b/common/offline-m2/com/android/tools/common/25.0.0-beta6/common-25.0.0-beta6.pom
index 0756bda..4e576d5 100644
--- a/common/offline-m2/com/android/tools/common/25.0.0-beta6/common-25.0.0-beta6.pom
+++ b/common/offline-m2/com/android/tools/common/25.0.0-beta6/common-25.0.0-beta6.pom
@@ -33,18 +33,18 @@
       <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>annotations</artifactId>
       <version>25.0.0-beta6</version>
       <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>
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta6/ddmlib-25.0.0-beta6.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta6/ddmlib-25.0.0-beta6.jar
index b0db910..d05cf85 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta6/ddmlib-25.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta6/ddmlib-25.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta6/ddmlib-25.0.0-beta6.pom b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta6/ddmlib-25.0.0-beta6.pom
index 702ff77..c80356f 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta6/ddmlib-25.0.0-beta6.pom
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-beta6/ddmlib-25.0.0-beta6.pom
@@ -33,18 +33,18 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0-beta6</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.0.0-beta6</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>3.1</version>
diff --git a/common/offline-m2/com/android/tools/dvlib/25.0.0-beta6/dvlib-25.0.0-beta6.jar b/common/offline-m2/com/android/tools/dvlib/25.0.0-beta6/dvlib-25.0.0-beta6.jar
index 7ac210b..5515df4 100644
--- a/common/offline-m2/com/android/tools/dvlib/25.0.0-beta6/dvlib-25.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/dvlib/25.0.0-beta6/dvlib-25.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/dvlib/25.0.0-beta6/dvlib-25.0.0-beta6.pom b/common/offline-m2/com/android/tools/dvlib/25.0.0-beta6/dvlib-25.0.0-beta6.pom
index 4cb4f73..8fbd682 100644
--- a/common/offline-m2/com/android/tools/dvlib/25.0.0-beta6/dvlib-25.0.0-beta6.pom
+++ b/common/offline-m2/com/android/tools/dvlib/25.0.0-beta6/dvlib-25.0.0-beta6.pom
@@ -27,16 +27,16 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0-beta6</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.0.0-beta6</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0.jar b/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0.jar
index c9fc5ee..a2c4b17 100644
--- a/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0.jar
+++ b/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0.jar b/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0.jar
index c59636c..7830bbc 100644
--- a/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0.jar
+++ b/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta6/layoutlib-api-25.0.0-beta6.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta6/layoutlib-api-25.0.0-beta6.jar
index 2529793..1fbbd7c 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta6/layoutlib-api-25.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta6/layoutlib-api-25.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta6/layoutlib-api-25.0.0-beta6.pom b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta6/layoutlib-api-25.0.0-beta6.pom
index 25b5c73..e251478 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta6/layoutlib-api-25.0.0-beta6.pom
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-beta6/layoutlib-api-25.0.0-beta6.pom
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>annotations</artifactId>
       <version>25.0.0-beta6</version>
       <scope>compile</scope>
     </dependency>
@@ -52,7 +52,7 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
+      <artifactId>common</artifactId>
       <version>25.0.0-beta6</version>
       <scope>compile</scope>
     </dependency>
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta6/lint-api-25.0.0-beta6.jar b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta6/lint-api-25.0.0-beta6.jar
index ec5777c..98215ef 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta6/lint-api-25.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta6/lint-api-25.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta6/lint-api-25.0.0-beta6.pom b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta6/lint-api-25.0.0-beta6.pom
index 8afd43b..f9d60f5 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta6/lint-api-25.0.0-beta6.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-beta6/lint-api-25.0.0-beta6.pom
@@ -39,18 +39,18 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.external.lombok</groupId>
-      <artifactId>lombok-ast</artifactId>
-      <version>0.2.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdk-common</artifactId>
       <version>25.0.0-beta6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.external.lombok</groupId>
+      <artifactId>lombok-ast</artifactId>
+      <version>0.2.3</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>builder-model</artifactId>
       <version>2.0.0-beta6</version>
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta6/lint-checks-25.0.0-beta6.jar b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta6/lint-checks-25.0.0-beta6.jar
index 660dda9..decedee 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta6/lint-checks-25.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta6/lint-checks-25.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta6/lint-checks-25.0.0-beta6.pom b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta6/lint-checks-25.0.0-beta6.pom
index 5ec9f9b..a0e7b18 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta6/lint-checks-25.0.0-beta6.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-beta6/lint-checks-25.0.0-beta6.pom
@@ -27,16 +27,16 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-analysis</artifactId>
-      <version>5.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools.lint</groupId>
       <artifactId>lint-api</artifactId>
       <version>25.0.0-beta6</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-analysis</artifactId>
+      <version>5.0.3</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta6/lint-25.0.0-beta6.jar b/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta6/lint-25.0.0-beta6.jar
index a911c07..7671a73 100644
--- a/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta6/lint-25.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/lint/lint/25.0.0-beta6/lint-25.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/repository/25.0.0-beta6/repository-25.0.0-beta6.jar b/common/offline-m2/com/android/tools/repository/25.0.0-beta6/repository-25.0.0-beta6.jar
index bc45733..4275fa2 100644
--- a/common/offline-m2/com/android/tools/repository/25.0.0-beta6/repository-25.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/repository/25.0.0-beta6/repository-25.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/repository/25.0.0-beta6/repository-25.0.0-beta6.pom b/common/offline-m2/com/android/tools/repository/25.0.0-beta6/repository-25.0.0-beta6.pom
index 6ccb266..e278701 100644
--- a/common/offline-m2/com/android/tools/repository/25.0.0-beta6/repository-25.0.0-beta6.pom
+++ b/common/offline-m2/com/android/tools/repository/25.0.0-beta6/repository-25.0.0-beta6.pom
@@ -27,12 +27,6 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0-beta6</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
@@ -44,5 +38,11 @@
       <version>1.8.1</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.0.0-beta6</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta6/sdk-common-25.0.0-beta6.jar b/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta6/sdk-common-25.0.0-beta6.jar
index c56c167..cf4e618 100644
--- a/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta6/sdk-common-25.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta6/sdk-common-25.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta6/sdk-common-25.0.0-beta6.pom b/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta6/sdk-common-25.0.0-beta6.pom
index 728bdb9..b7d92bf 100644
--- a/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta6/sdk-common-25.0.0-beta6.pom
+++ b/common/offline-m2/com/android/tools/sdk-common/25.0.0-beta6/sdk-common-25.0.0-beta6.pom
@@ -52,15 +52,21 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>25.0.0-beta6</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
       <artifactId>sdklib</artifactId>
       <version>25.0.0-beta6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.0.0-beta6</version>
-      <scope>test</scope>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-model</artifactId>
+      <version>2.0.0-beta6</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
@@ -74,11 +80,5 @@
       <version>1.48</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.0.0-beta6</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/sdklib/25.0.0-beta6/sdklib-25.0.0-beta6.jar b/common/offline-m2/com/android/tools/sdklib/25.0.0-beta6/sdklib-25.0.0-beta6.jar
index b35ed74..1f21f0f 100644
--- a/common/offline-m2/com/android/tools/sdklib/25.0.0-beta6/sdklib-25.0.0-beta6.jar
+++ b/common/offline-m2/com/android/tools/sdklib/25.0.0-beta6/sdklib-25.0.0-beta6.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdklib/25.0.0-beta6/sdklib-25.0.0-beta6.pom b/common/offline-m2/com/android/tools/sdklib/25.0.0-beta6/sdklib-25.0.0-beta6.pom
index b07fecb..972fa62 100644
--- a/common/offline-m2/com/android/tools/sdklib/25.0.0-beta6/sdklib-25.0.0-beta6.pom
+++ b/common/offline-m2/com/android/tools/sdklib/25.0.0-beta6/sdklib-25.0.0-beta6.pom
@@ -27,8 +27,14 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.layoutlib</groupId>
-      <artifactId>layoutlib-api</artifactId>
+      <groupId>com.android.tools</groupId>
+      <artifactId>repository</artifactId>
+      <version>25.0.0-beta6</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>dvlib</artifactId>
       <version>25.0.0-beta6</version>
       <scope>compile</scope>
     </dependency>
@@ -51,8 +57,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>repository</artifactId>
+      <groupId>com.android.tools.layoutlib</groupId>
+      <artifactId>layoutlib-api</artifactId>
       <version>25.0.0-beta6</version>
       <scope>compile</scope>
     </dependency>
@@ -68,11 +74,5 @@
       <version>1.8.1</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>dvlib</artifactId>
-      <version>25.0.0-beta6</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>