Update alpha8 prebuilt

Now based on tools/base e95b95cf8041dc5f201e1c5f99aaf26c7256a79f instead.

Change-Id: I0aca62e16f3d57b55360bd55cb5ebd9a64282ba0
diff --git a/common/offline-m2/com/android/databinding/baseLibrary/1.1/baseLibrary-1.1-sources.jar b/common/offline-m2/com/android/databinding/baseLibrary/1.1/baseLibrary-1.1-sources.jar
index 32f4e90..40d4d0f 100644
--- a/common/offline-m2/com/android/databinding/baseLibrary/1.1/baseLibrary-1.1-sources.jar
+++ b/common/offline-m2/com/android/databinding/baseLibrary/1.1/baseLibrary-1.1-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/baseLibrary/1.1/baseLibrary-1.1.jar b/common/offline-m2/com/android/databinding/baseLibrary/1.1/baseLibrary-1.1.jar
index a908fdc..7028435 100644
--- a/common/offline-m2/com/android/databinding/baseLibrary/1.1/baseLibrary-1.1.jar
+++ b/common/offline-m2/com/android/databinding/baseLibrary/1.1/baseLibrary-1.1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compilerCommon/1.1/compilerCommon-1.1-sources.jar b/common/offline-m2/com/android/databinding/compilerCommon/1.1/compilerCommon-1.1-sources.jar
index 180abb0..4d129ac 100644
--- a/common/offline-m2/com/android/databinding/compilerCommon/1.1/compilerCommon-1.1-sources.jar
+++ b/common/offline-m2/com/android/databinding/compilerCommon/1.1/compilerCommon-1.1-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compilerCommon/1.1/compilerCommon-1.1.jar b/common/offline-m2/com/android/databinding/compilerCommon/1.1/compilerCommon-1.1.jar
index 2f9426a..2b2142b 100644
--- a/common/offline-m2/com/android/databinding/compilerCommon/1.1/compilerCommon-1.1.jar
+++ b/common/offline-m2/com/android/databinding/compilerCommon/1.1/compilerCommon-1.1.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compilerCommon/1.1/compilerCommon-1.1.pom b/common/offline-m2/com/android/databinding/compilerCommon/1.1/compilerCommon-1.1.pom
index b30034a..becb937 100644
--- a/common/offline-m2/com/android/databinding/compilerCommon/1.1/compilerCommon-1.1.pom
+++ b/common/offline-m2/com/android/databinding/compilerCommon/1.1/compilerCommon-1.1.pom
@@ -45,12 +45,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.tunnelvisionlabs</groupId>
       <artifactId>antlr4</artifactId>
       <version>4.5</version>
@@ -62,5 +56,11 @@
       <version>2.4</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>baseLibrary</artifactId>
+      <version>1.1</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/annotations/25.0.0-alpha8/annotations-25.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/annotations/25.0.0-alpha8/annotations-25.0.0-alpha8-sources.jar
index 6e3c75d..8ebd4aa 100644
--- a/common/offline-m2/com/android/tools/annotations/25.0.0-alpha8/annotations-25.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/annotations/25.0.0-alpha8/annotations-25.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/annotations/25.0.0-alpha8/annotations-25.0.0-alpha8.jar b/common/offline-m2/com/android/tools/annotations/25.0.0-alpha8/annotations-25.0.0-alpha8.jar
index c1ba1c9..eec051c 100644
--- a/common/offline-m2/com/android/tools/annotations/25.0.0-alpha8/annotations-25.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/annotations/25.0.0-alpha8/annotations-25.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-alpha8/builder-model-2.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-alpha8/builder-model-2.0.0-alpha8-sources.jar
index 3e5b86e..329ff8e 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-alpha8/builder-model-2.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-alpha8/builder-model-2.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-alpha8/builder-model-2.0.0-alpha8.jar b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-alpha8/builder-model-2.0.0-alpha8.jar
index 792455f..ae4baec 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/2.0.0-alpha8/builder-model-2.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/build/builder-model/2.0.0-alpha8/builder-model-2.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-alpha8/builder-test-api-2.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-alpha8/builder-test-api-2.0.0-alpha8-sources.jar
index af10cf8..ba033d5 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-alpha8/builder-test-api-2.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-alpha8/builder-test-api-2.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-alpha8/builder-test-api-2.0.0-alpha8.jar b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-alpha8/builder-test-api-2.0.0-alpha8.jar
index b5914f9..92a1d14 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-alpha8/builder-test-api-2.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/2.0.0-alpha8/builder-test-api-2.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder/2.0.0-alpha8/builder-2.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/build/builder/2.0.0-alpha8/builder-2.0.0-alpha8-sources.jar
index e9e1466..5045599 100644
--- a/common/offline-m2/com/android/tools/build/builder/2.0.0-alpha8/builder-2.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/build/builder/2.0.0-alpha8/builder-2.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder/2.0.0-alpha8/builder-2.0.0-alpha8.jar b/common/offline-m2/com/android/tools/build/builder/2.0.0-alpha8/builder-2.0.0-alpha8.jar
index 3bf1418..73011d2 100644
--- a/common/offline-m2/com/android/tools/build/builder/2.0.0-alpha8/builder-2.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/build/builder/2.0.0-alpha8/builder-2.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder/2.0.0-alpha8/builder-2.0.0-alpha8.pom b/common/offline-m2/com/android/tools/build/builder/2.0.0-alpha8/builder-2.0.0-alpha8.pom
index 9c78efe..5c24084 100644
--- a/common/offline-m2/com/android/tools/build/builder/2.0.0-alpha8/builder-2.0.0-alpha8.pom
+++ b/common/offline-m2/com/android/tools/build/builder/2.0.0-alpha8/builder-2.0.0-alpha8.pom
@@ -27,24 +27,18 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.0.0-alpha8</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.0.0-alpha8</version>
-      <scope>compile</scope>
-    </dependency>
-    <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-alpha8</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdklib</artifactId>
       <version>25.0.0-alpha8</version>
@@ -63,44 +57,26 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.0.0-alpha8</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.0.0-alpha8</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.squareup</groupId>
       <artifactId>javawriter</artifactId>
       <version>2.5.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdk-common</artifactId>
+      <version>25.0.0-alpha8</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.android.tools.jill</groupId>
       <artifactId>jill-api</artifactId>
       <version>0.9.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>manifest-merger</artifactId>
-      <version>25.0.0-alpha8</version>
-      <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>
+      <groupId>com.android.tools.ddms</groupId>
+      <artifactId>ddmlib</artifactId>
       <version>25.0.0-alpha8</version>
       <scope>compile</scope>
     </dependency>
@@ -117,10 +93,16 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-model</artifactId>
+      <version>2.0.0-alpha8</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
+      <artifactId>common</artifactId>
       <version>25.0.0-alpha8</version>
-      <scope>test</scope>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
@@ -129,10 +111,28 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>manifest-merger</artifactId>
+      <version>25.0.0-alpha8</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.jack</groupId>
+      <artifactId>jack-api</artifactId>
+      <version>0.9.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>25.0.0-alpha8</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-alpha8/gradle-api-2.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-alpha8/gradle-api-2.0.0-alpha8-sources.jar
index 32454be..49d2ede 100644
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-alpha8/gradle-api-2.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-alpha8/gradle-api-2.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-alpha8/gradle-api-2.0.0-alpha8.jar b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-alpha8/gradle-api-2.0.0-alpha8.jar
index 8bbdbd0..6aad6da 100644
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-alpha8/gradle-api-2.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-alpha8/gradle-api-2.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-alpha8/gradle-api-2.0.0-alpha8.pom b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-alpha8/gradle-api-2.0.0-alpha8.pom
index b21baa6..9696c85 100644
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-alpha8/gradle-api-2.0.0-alpha8.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-api/2.0.0-alpha8/gradle-api-2.0.0-alpha8.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-alpha8</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-alpha8/gradle-core-2.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-alpha8/gradle-core-2.0.0-alpha8-sources.jar
index 0304a2e..934a707 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-alpha8/gradle-core-2.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-alpha8/gradle-core-2.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-alpha8/gradle-core-2.0.0-alpha8.jar b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-alpha8/gradle-core-2.0.0-alpha8.jar
index 09fa381..a71972d 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-alpha8/gradle-core-2.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-alpha8/gradle-core-2.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-alpha8/gradle-core-2.0.0-alpha8.pom b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-alpha8/gradle-core-2.0.0-alpha8.pom
index b5db3e4..5c3ac10 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-alpha8/gradle-core-2.0.0-alpha8.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-core/2.0.0-alpha8/gradle-core-2.0.0-alpha8.pom
@@ -39,14 +39,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-api</artifactId>
-      <version>2.0.0-alpha8</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-annotations</artifactId>
+      <groupId>tools.base</groupId>
+      <artifactId>project-test-lib</artifactId>
       <version>unspecified</version>
       <scope>test</scope>
     </dependency>
@@ -69,6 +63,18 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>gradle-api</artifactId>
+      <version>2.0.0-alpha8</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>compilerCommon</artifactId>
+      <version>1.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.android.tools.lint</groupId>
       <artifactId>lint</artifactId>
       <version>25.0.0-alpha8</version>
@@ -81,10 +87,10 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>1.1</version>
-      <scope>compile</scope>
+      <groupId>tools.base.instant-run</groupId>
+      <artifactId>instant-run-annotations</artifactId>
+      <version>unspecified</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -93,21 +99,21 @@
       <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>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>5.0.3</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>0.28</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -116,11 +122,5 @@
       <version>25.0.0-alpha8</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-alpha8/gradle-experimental-0.6.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-alpha8/gradle-experimental-0.6.0-alpha8-sources.jar
index 589ae39..5e55a8a 100644
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-alpha8/gradle-experimental-0.6.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-alpha8/gradle-experimental-0.6.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-alpha8/gradle-experimental-0.6.0-alpha8.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-alpha8/gradle-experimental-0.6.0-alpha8.jar
index 549d818..95be93b 100644
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-alpha8/gradle-experimental-0.6.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-alpha8/gradle-experimental-0.6.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-alpha8/gradle-experimental-0.6.0-alpha8.pom b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-alpha8/gradle-experimental-0.6.0-alpha8.pom
index 0b873bd..539cbcf 100644
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-alpha8/gradle-experimental-0.6.0-alpha8.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-experimental/0.6.0-alpha8/gradle-experimental-0.6.0-alpha8.pom
@@ -27,12 +27,6 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>gradle-core</artifactId>
       <version>2.0.0-alpha8</version>
@@ -44,5 +38,11 @@
       <version>unspecified</version>
       <scope>test</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/2.0.0-alpha8/gradle-2.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/build/gradle/2.0.0-alpha8/gradle-2.0.0-alpha8-sources.jar
index 8bfa3f4..8da2487 100644
--- a/common/offline-m2/com/android/tools/build/gradle/2.0.0-alpha8/gradle-2.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/build/gradle/2.0.0-alpha8/gradle-2.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/2.0.0-alpha8/gradle-2.0.0-alpha8.jar b/common/offline-m2/com/android/tools/build/gradle/2.0.0-alpha8/gradle-2.0.0-alpha8.jar
index 41e7661..aed0cb2 100644
--- a/common/offline-m2/com/android/tools/build/gradle/2.0.0-alpha8/gradle-2.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/build/gradle/2.0.0-alpha8/gradle-2.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/2.0.0-alpha8/gradle-2.0.0-alpha8.pom b/common/offline-m2/com/android/tools/build/gradle/2.0.0-alpha8/gradle-2.0.0-alpha8.pom
index 4a5285e..d9386a8 100644
--- a/common/offline-m2/com/android/tools/build/gradle/2.0.0-alpha8/gradle-2.0.0-alpha8.pom
+++ b/common/offline-m2/com/android/tools/build/gradle/2.0.0-alpha8/gradle-2.0.0-alpha8.pom
@@ -27,12 +27,6 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>gradle-core</artifactId>
       <version>2.0.0-alpha8</version>
@@ -44,5 +38,11 @@
       <version>unspecified</version>
       <scope>test</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/manifest-merger/25.0.0-alpha8/manifest-merger-25.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-alpha8/manifest-merger-25.0.0-alpha8-sources.jar
index e1f7f6d..c9ad4cb 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-alpha8/manifest-merger-25.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-alpha8/manifest-merger-25.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-alpha8/manifest-merger-25.0.0-alpha8.jar b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-alpha8/manifest-merger-25.0.0-alpha8.jar
index 95ef14f..5396d47 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-alpha8/manifest-merger-25.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-alpha8/manifest-merger-25.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-alpha8/manifest-merger-25.0.0-alpha8.pom b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-alpha8/manifest-merger-25.0.0-alpha8.pom
index 39d2be5..65858d7 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-alpha8/manifest-merger-25.0.0-alpha8.pom
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/25.0.0-alpha8/manifest-merger-25.0.0-alpha8.pom
@@ -33,6 +33,12 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdk-common</artifactId>
+      <version>25.0.0-alpha8</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.9.5</version>
@@ -40,12 +46,6 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0-alpha8</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
       <artifactId>sdklib</artifactId>
       <version>25.0.0-alpha8</version>
       <scope>compile</scope>
@@ -57,16 +57,16 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.0.0-alpha8</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
       <version>2.2.4</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.0.0-alpha8</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/common/25.0.0-alpha8/common-25.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/common/25.0.0-alpha8/common-25.0.0-alpha8-sources.jar
index 9ec143f..d2ff2d9 100644
--- a/common/offline-m2/com/android/tools/common/25.0.0-alpha8/common-25.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/common/25.0.0-alpha8/common-25.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/common/25.0.0-alpha8/common-25.0.0-alpha8.jar b/common/offline-m2/com/android/tools/common/25.0.0-alpha8/common-25.0.0-alpha8.jar
index 42fd78d..807fc5e 100644
--- a/common/offline-m2/com/android/tools/common/25.0.0-alpha8/common-25.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/common/25.0.0-alpha8/common-25.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/common/25.0.0-alpha8/common-25.0.0-alpha8.pom b/common/offline-m2/com/android/tools/common/25.0.0-alpha8/common-25.0.0-alpha8.pom
index 3fbe02d..d403ef5 100644
--- a/common/offline-m2/com/android/tools/common/25.0.0-alpha8/common-25.0.0-alpha8.pom
+++ b/common/offline-m2/com/android/tools/common/25.0.0-alpha8/common-25.0.0-alpha8.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-alpha8</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-alpha8/ddmlib-25.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-alpha8/ddmlib-25.0.0-alpha8-sources.jar
index 4d4c00c..df5e932 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-alpha8/ddmlib-25.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-alpha8/ddmlib-25.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-alpha8/ddmlib-25.0.0-alpha8.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-alpha8/ddmlib-25.0.0-alpha8.jar
index c672af6..ae7fcda 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-alpha8/ddmlib-25.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-alpha8/ddmlib-25.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-alpha8/ddmlib-25.0.0-alpha8.pom b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-alpha8/ddmlib-25.0.0-alpha8.pom
index 8b73142..d447b4e 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-alpha8/ddmlib-25.0.0-alpha8.pom
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/25.0.0-alpha8/ddmlib-25.0.0-alpha8.pom
@@ -33,18 +33,18 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0-alpha8</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-alpha8</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-alpha8/dvlib-25.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/dvlib/25.0.0-alpha8/dvlib-25.0.0-alpha8-sources.jar
index 55c04b1..8faea30 100644
--- a/common/offline-m2/com/android/tools/dvlib/25.0.0-alpha8/dvlib-25.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/dvlib/25.0.0-alpha8/dvlib-25.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/dvlib/25.0.0-alpha8/dvlib-25.0.0-alpha8.jar b/common/offline-m2/com/android/tools/dvlib/25.0.0-alpha8/dvlib-25.0.0-alpha8.jar
index 5453472..3390fd4 100644
--- a/common/offline-m2/com/android/tools/dvlib/25.0.0-alpha8/dvlib-25.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/dvlib/25.0.0-alpha8/dvlib-25.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/dvlib/25.0.0-alpha8/dvlib-25.0.0-alpha8.pom b/common/offline-m2/com/android/tools/dvlib/25.0.0-alpha8/dvlib-25.0.0-alpha8.pom
index 6d4f54f..9de692b 100644
--- a/common/offline-m2/com/android/tools/dvlib/25.0.0-alpha8/dvlib-25.0.0-alpha8.pom
+++ b/common/offline-m2/com/android/tools/dvlib/25.0.0-alpha8/dvlib-25.0.0-alpha8.pom
@@ -27,16 +27,16 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0-alpha8</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-alpha8</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-sources.jar b/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0-sources.jar
index 1025e84..16a5c28 100644
--- a/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0-sources.jar
+++ b/common/offline-m2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0-sources.jar
Binary files differ
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 5f91cf2..0ed7722 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-sources.jar b/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0-sources.jar
index 2c0e2d1..bcaa47b 100644
--- a/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0-sources.jar
+++ b/common/offline-m2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0-sources.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 4ceef9e..9b2d63a 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-alpha8/layoutlib-api-25.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-alpha8/layoutlib-api-25.0.0-alpha8-sources.jar
index 9f621eb..0ba2e65 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-alpha8/layoutlib-api-25.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-alpha8/layoutlib-api-25.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-alpha8/layoutlib-api-25.0.0-alpha8.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-alpha8/layoutlib-api-25.0.0-alpha8.jar
index 0add52e..fd44be0 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-alpha8/layoutlib-api-25.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-alpha8/layoutlib-api-25.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-alpha8/layoutlib-api-25.0.0-alpha8.pom b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-alpha8/layoutlib-api-25.0.0-alpha8.pom
index c665de9..e27f86d 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-alpha8/layoutlib-api-25.0.0-alpha8.pom
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.0.0-alpha8/layoutlib-api-25.0.0-alpha8.pom
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>annotations</artifactId>
       <version>25.0.0-alpha8</version>
       <scope>compile</scope>
     </dependency>
@@ -46,7 +46,7 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
+      <artifactId>common</artifactId>
       <version>25.0.0-alpha8</version>
       <scope>compile</scope>
     </dependency>
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-alpha8/lint-api-25.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-alpha8/lint-api-25.0.0-alpha8-sources.jar
index 00dcc62..69a76a7 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-alpha8/lint-api-25.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-alpha8/lint-api-25.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-alpha8/lint-api-25.0.0-alpha8.jar b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-alpha8/lint-api-25.0.0-alpha8.jar
index 8a59fce..a6ad87a 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-alpha8/lint-api-25.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-alpha8/lint-api-25.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-alpha8/lint-api-25.0.0-alpha8.pom b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-alpha8/lint-api-25.0.0-alpha8.pom
index 528396e..e43febb 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-alpha8/lint-api-25.0.0-alpha8.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-api/25.0.0-alpha8/lint-api-25.0.0-alpha8.pom
@@ -27,12 +27,6 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.0.0-alpha8</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdk-common</artifactId>
       <version>25.0.0-alpha8</version>
@@ -56,5 +50,11 @@
       <version>0.2.3</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-model</artifactId>
+      <version>2.0.0-alpha8</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-alpha8/lint-checks-25.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-alpha8/lint-checks-25.0.0-alpha8-sources.jar
index 55499c1..59884d2 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-alpha8/lint-checks-25.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-alpha8/lint-checks-25.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-alpha8/lint-checks-25.0.0-alpha8.jar b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-alpha8/lint-checks-25.0.0-alpha8.jar
index b8562db..2bedb57 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-alpha8/lint-checks-25.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/25.0.0-alpha8/lint-checks-25.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint/25.0.0-alpha8/lint-25.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/lint/lint/25.0.0-alpha8/lint-25.0.0-alpha8-sources.jar
index f199698..0cbc259 100644
--- a/common/offline-m2/com/android/tools/lint/lint/25.0.0-alpha8/lint-25.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/lint/lint/25.0.0-alpha8/lint-25.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint/25.0.0-alpha8/lint-25.0.0-alpha8.jar b/common/offline-m2/com/android/tools/lint/lint/25.0.0-alpha8/lint-25.0.0-alpha8.jar
index c09ef48..f022e4f 100644
--- a/common/offline-m2/com/android/tools/lint/lint/25.0.0-alpha8/lint-25.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/lint/lint/25.0.0-alpha8/lint-25.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint/25.0.0-alpha8/lint-25.0.0-alpha8.pom b/common/offline-m2/com/android/tools/lint/lint/25.0.0-alpha8/lint-25.0.0-alpha8.pom
index ec8624a..f2829c5 100644
--- a/common/offline-m2/com/android/tools/lint/lint/25.0.0-alpha8/lint-25.0.0-alpha8.pom
+++ b/common/offline-m2/com/android/tools/lint/lint/25.0.0-alpha8/lint-25.0.0-alpha8.pom
@@ -27,16 +27,16 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-checks</artifactId>
-      <version>25.0.0-alpha8</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.eclipse.jdt.core.compiler</groupId>
       <artifactId>ecj</artifactId>
       <version>4.4.2</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.android.tools.lint</groupId>
+      <artifactId>lint-checks</artifactId>
+      <version>25.0.0-alpha8</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/repository/25.0.0-alpha8/repository-25.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/repository/25.0.0-alpha8/repository-25.0.0-alpha8-sources.jar
index 8e19271..0a862ff 100644
--- a/common/offline-m2/com/android/tools/repository/25.0.0-alpha8/repository-25.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/repository/25.0.0-alpha8/repository-25.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/repository/25.0.0-alpha8/repository-25.0.0-alpha8.jar b/common/offline-m2/com/android/tools/repository/25.0.0-alpha8/repository-25.0.0-alpha8.jar
index ac3fa3d..3bdf9d9 100644
--- a/common/offline-m2/com/android/tools/repository/25.0.0-alpha8/repository-25.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/repository/25.0.0-alpha8/repository-25.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/repository/25.0.0-alpha8/repository-25.0.0-alpha8.pom b/common/offline-m2/com/android/tools/repository/25.0.0-alpha8/repository-25.0.0-alpha8.pom
index 68741e3..af7dbb3 100644
--- a/common/offline-m2/com/android/tools/repository/25.0.0-alpha8/repository-25.0.0-alpha8.pom
+++ b/common/offline-m2/com/android/tools/repository/25.0.0-alpha8/repository-25.0.0-alpha8.pom
@@ -27,12 +27,6 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.0.0-alpha8</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-alpha8</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/sdk-common/25.0.0-alpha8/sdk-common-25.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/sdk-common/25.0.0-alpha8/sdk-common-25.0.0-alpha8-sources.jar
index 818a37c..8b07341 100644
--- a/common/offline-m2/com/android/tools/sdk-common/25.0.0-alpha8/sdk-common-25.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/sdk-common/25.0.0-alpha8/sdk-common-25.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdk-common/25.0.0-alpha8/sdk-common-25.0.0-alpha8.jar b/common/offline-m2/com/android/tools/sdk-common/25.0.0-alpha8/sdk-common-25.0.0-alpha8.jar
index 623ffaf..1cff6de 100644
--- a/common/offline-m2/com/android/tools/sdk-common/25.0.0-alpha8/sdk-common-25.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/sdk-common/25.0.0-alpha8/sdk-common-25.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdk-common/25.0.0-alpha8/sdk-common-25.0.0-alpha8.pom b/common/offline-m2/com/android/tools/sdk-common/25.0.0-alpha8/sdk-common-25.0.0-alpha8.pom
index 2ea938d..e9f1f52 100644
--- a/common/offline-m2/com/android/tools/sdk-common/25.0.0-alpha8/sdk-common-25.0.0-alpha8.pom
+++ b/common/offline-m2/com/android/tools/sdk-common/25.0.0-alpha8/sdk-common-25.0.0-alpha8.pom
@@ -28,7 +28,7 @@
   <dependencies>
     <dependency>
       <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
+      <artifactId>builder-test-api</artifactId>
       <version>2.0.0-alpha8</version>
       <scope>compile</scope>
     </dependency>
@@ -58,17 +58,11 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
+      <artifactId>builder-model</artifactId>
       <version>2.0.0-alpha8</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.0.0-alpha8</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>3.3</version>
@@ -80,5 +74,11 @@
       <version>1.48</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>25.0.0-alpha8</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/sdklib/25.0.0-alpha8/sdklib-25.0.0-alpha8-sources.jar b/common/offline-m2/com/android/tools/sdklib/25.0.0-alpha8/sdklib-25.0.0-alpha8-sources.jar
index a6b348b..ab40b48 100644
--- a/common/offline-m2/com/android/tools/sdklib/25.0.0-alpha8/sdklib-25.0.0-alpha8-sources.jar
+++ b/common/offline-m2/com/android/tools/sdklib/25.0.0-alpha8/sdklib-25.0.0-alpha8-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdklib/25.0.0-alpha8/sdklib-25.0.0-alpha8.jar b/common/offline-m2/com/android/tools/sdklib/25.0.0-alpha8/sdklib-25.0.0-alpha8.jar
index b3d1a23..9ed8f8f 100644
--- a/common/offline-m2/com/android/tools/sdklib/25.0.0-alpha8/sdklib-25.0.0-alpha8.jar
+++ b/common/offline-m2/com/android/tools/sdklib/25.0.0-alpha8/sdklib-25.0.0-alpha8.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdklib/25.0.0-alpha8/sdklib-25.0.0-alpha8.pom b/common/offline-m2/com/android/tools/sdklib/25.0.0-alpha8/sdklib-25.0.0-alpha8.pom
index 31e6fa9..9d468cf 100644
--- a/common/offline-m2/com/android/tools/sdklib/25.0.0-alpha8/sdklib-25.0.0-alpha8.pom
+++ b/common/offline-m2/com/android/tools/sdklib/25.0.0-alpha8/sdklib-25.0.0-alpha8.pom
@@ -45,12 +45,6 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>dvlib</artifactId>
-      <version>25.0.0-alpha8</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
       <version>4.1</version>
@@ -63,6 +57,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>dvlib</artifactId>
+      <version>25.0.0-alpha8</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
       <version>2.2.4</version>