Update 2.2-beta1 Gradle plugin prebuilts (build #41)

https://pantheon.corp.google.com/storage/browser/android-devtools-archives/tools-build_studio-2.2-release/41

Change-Id: Ibfbc92f54646dee4bc0c5f320183d0fff9941859
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 bc644c3..2a9bbc4 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 1a45ffa..abf6ed8 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 440c458..0e24ad0 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
@@ -39,15 +39,15 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.googlecode.juniversalchardet</groupId>
-      <artifactId>juniversalchardet</artifactId>
-      <version>1.0.3</version>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>compilerCommon</artifactId>
+      <version>2.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>2.2.0-beta1</version>
+      <groupId>com.googlecode.juniversalchardet</groupId>
+      <artifactId>juniversalchardet</artifactId>
+      <version>1.0.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -63,16 +63,16 @@
       <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>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib</artifactId>
       <version>1.0.0</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>baseLibrary</artifactId>
+      <version>2.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
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 60aab09..6f87dbb 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 4eec72a..39bc9ba 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>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>
+    <dependency>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>baseLibrary</artifactId>
+      <version>2.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
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
index df30bc5..8a63394 100644
--- 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
Binary files differ
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
index df4a755..b0816f7 100644
--- 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
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
index 7e20650..fefc666 100644
--- 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
@@ -27,6 +27,12 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>17.0</version>
@@ -39,21 +45,9 @@
       <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>
+      <artifactId>testutils</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>
@@ -63,9 +57,15 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
+      <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>
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 6fd9a3b..2ae31dd 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 55c4383..ed71941 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
@@ -27,6 +27,12 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>17.0</version>
@@ -39,8 +45,20 @@
       <scope>test</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</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>testutils</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>annotations</artifactId>
       <version>25.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
@@ -57,28 +75,10 @@
       <scope>test</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.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
       <version>2.5.0</version>
       <scope>compile</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>
   </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 bd3475d..0da0cbb 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 bb9f814..538dc67 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 c33e976..09b4fa7 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/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 2eac47b..db9bd6e 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 8f1c68f..b022a41 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,38 +27,26 @@
   </scm>
   <dependencies>
     <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>tracker</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.build</groupId>
+      <artifactId>builder-test-api</artifactId>
+      <version>2.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</groupId>
-      <artifactId>common</artifactId>
+      <groupId>com.android.tools.analytics-library</groupId>
+      <artifactId>protos</artifactId>
       <version>25.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
@@ -69,12 +57,6 @@
       <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>org.ow2.asm</groupId>
       <artifactId>asm-tree</artifactId>
       <version>5.0.4</version>
@@ -87,27 +69,33 @@
       <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.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.2.0-beta1</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>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
       <version>25.2.0-beta1</version>
-      <scope>compile</scope>
+      <scope>test</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>
+      <groupId>com.android.tools.analytics-library</groupId>
+      <artifactId>tracker</artifactId>
+      <version>25.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -117,6 +105,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdklib</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.squareup</groupId>
       <artifactId>javawriter</artifactId>
       <version>2.5.0</version>
@@ -124,7 +118,19 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
+      <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.build</groupId>
+      <artifactId>manifest-merger</artifactId>
       <version>25.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
@@ -141,12 +147,6 @@
       <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 86ad9e5..bb1a269 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 b76e5ff..15176d6 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 81fd53e..a4f3f71 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,6 +27,12 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>gradle-api</artifactId>
+      <version>2.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.jsoup</groupId>
       <artifactId>jsoup</artifactId>
       <version>1.6.3</version>
@@ -63,33 +69,39 @@
       <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>com.android.tools.lint</groupId>
+      <artifactId>lint</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.jacoco</groupId>
       <artifactId>org.jacoco.core</artifactId>
       <version>0.7.5.201505241946</version>
       <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>org.jacoco</groupId>
-      <artifactId>org.jacoco.report</artifactId>
-      <version>0.7.5.201505241946</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>com.android.tools.lint</groupId>
-      <artifactId>lint</artifactId>
-      <version>25.2.0-beta1</version>
+      <groupId>org.jacoco</groupId>
+      <artifactId>org.jacoco.report</artifactId>
+      <version>0.7.5.201505241946</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder</artifactId>
+      <version>2.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -99,16 +111,22 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>compilerCommon</artifactId>
+      <version>2.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>net.sf.jopt-simple</groupId>
       <artifactId>jopt-simple</artifactId>
       <version>4.9</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>net.sf.proguard</groupId>
@@ -129,24 +147,6 @@
       <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 2dbebcb..790db0b 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 e611afd..c00bb8a 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
@@ -33,16 +33,16 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>tools.base</groupId>
       <artifactId>project-test-lib</artifactId>
       <version>unspecified</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>gradle-core</artifactId>
+      <version>2.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
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 1127e63..4470ee4 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 a21c8c9..4cc5100 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
@@ -33,12 +33,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
       <version>0.28</version>
@@ -50,5 +44,11 @@
       <version>unspecified</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>gradle-core</artifactId>
+      <version>2.2.0-beta1</version>
+      <scope>compile</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 d665e6f..1f50d13 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 740e196..e9349e8 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>sdk-common</artifactId>
+      <artifactId>common</artifactId>
       <version>25.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
@@ -46,13 +46,13 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>sdklib</artifactId>
       <version>25.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
+      <artifactId>sdk-common</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 97ef4a5..feeb2a9 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 69638af..53e0327 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/common/25.2.0-beta1/common-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/common/25.2.0-beta1/common-25.2.0-beta1.pom
index e53963c..3c599b0 100644
--- a/common/offline-m2/com/android/tools/common/25.2.0-beta1/common-25.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/common/25.2.0-beta1/common-25.2.0-beta1.pom
@@ -39,16 +39,16 @@
       <scope>test</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.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/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 89d9641..028f556 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/ddms/ddmlib/25.2.0-beta1/ddmlib-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta1/ddmlib-25.2.0-beta1.pom
index 62c09f9..e60a51d 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta1/ddmlib-25.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-beta1/ddmlib-25.2.0-beta1.pom
@@ -27,6 +27,12 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
@@ -39,12 +45,6 @@
       <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>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>3.1</version>
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 c572a3c..dea11b3 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/dvlib/25.2.0-beta1/dvlib-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/dvlib/25.2.0-beta1/dvlib-25.2.0-beta1.pom
index 6a9c944..92bf8b3 100644
--- a/common/offline-m2/com/android/tools/dvlib/25.2.0-beta1/dvlib-25.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/dvlib/25.2.0-beta1/dvlib-25.2.0-beta1.pom
@@ -27,16 +27,16 @@
   </scm>
   <dependencies>
     <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>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
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 cd26f53..bfcf7c7 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 540604d..fe436c7 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 26211b8..7a54849 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/layoutlib/layoutlib-api/25.2.0-beta1/layoutlib-api-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta1/layoutlib-api-25.2.0-beta1.pom
index c283c1b..834b58e 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta1/layoutlib-api-25.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-beta1/layoutlib-api-25.2.0-beta1.pom
@@ -27,6 +27,12 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
@@ -40,12 +46,6 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
       <artifactId>annotations</artifactId>
       <version>25.2.0-beta1</version>
       <scope>compile</scope>
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 3c5dcc1..b6fd9ba 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 96d67b1..6f99a74 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,24 +27,12 @@
   </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>
@@ -57,6 +45,18 @@
       <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 2af3dcd..ef0ba35 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/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 3de1c9e..a6271fb 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 cb005be..31de257 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/repository/25.2.0-beta1/repository-25.2.0-beta1.pom b/common/offline-m2/com/android/tools/repository/25.2.0-beta1/repository-25.2.0-beta1.pom
index eead993..1711fc8 100644
--- a/common/offline-m2/com/android/tools/repository/25.2.0-beta1/repository-25.2.0-beta1.pom
+++ b/common/offline-m2/com/android/tools/repository/25.2.0-beta1/repository-25.2.0-beta1.pom
@@ -27,18 +27,18 @@
   </scm>
   <dependencies>
     <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>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>com.google.jimfs</groupId>
       <artifactId>jimfs</artifactId>
       <version>1.1</version>
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 7b7ba9a..49f176e 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 70275fc..571d227 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,12 +27,6 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.2.0-beta1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
@@ -40,11 +34,17 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
+      <artifactId>builder-test-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.google.truth</groupId>
       <artifactId>truth</artifactId>
       <version>0.28</version>
@@ -57,6 +57,12 @@
       <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>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
       <version>1.48</version>
@@ -75,12 +81,6 @@
       <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/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 c791be3..388265f 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 1b0ef4e..fe18299 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
@@ -33,6 +33,12 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.layoutlib</groupId>
+      <artifactId>layoutlib-api</artifactId>
+      <version>25.2.0-beta1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
@@ -40,13 +46,13 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>repository</artifactId>
+      <artifactId>dvlib</artifactId>
       <version>25.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.layoutlib</groupId>
-      <artifactId>layoutlib-api</artifactId>
+      <groupId>com.android.tools</groupId>
+      <artifactId>repository</artifactId>
       <version>25.2.0-beta1</version>
       <scope>compile</scope>
     </dependency>
@@ -68,11 +74,5 @@
       <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>