Include gradle plugin 2.2.0-alpha7 (& remove 2.2.0-alpha5)

Build #50 from build-bot:
https://pantheon.corp.google.com/storage/browser/android-devtools-archives/tools-build_studio-2.2-release/50?pli=1

Change-Id: I9449aa631951bfdf880382e69f88120a8419099a
diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha5/baseLibrary-2.2.0-alpha5.jar b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha7/baseLibrary-2.2.0-alpha7.jar
similarity index 75%
rename from common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha5/baseLibrary-2.2.0-alpha5.jar
rename to common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha7/baseLibrary-2.2.0-alpha7.jar
index bf89e88..ccce19b 100644
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha5/baseLibrary-2.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha7/baseLibrary-2.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha5/baseLibrary-2.2.0-alpha5.pom b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha7/baseLibrary-2.2.0-alpha7.pom
similarity index 96%
rename from common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha5/baseLibrary-2.2.0-alpha5.pom
rename to common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha7/baseLibrary-2.2.0-alpha7.pom
index 349e520..c2d12d5 100644
--- a/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha5/baseLibrary-2.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/databinding/baseLibrary/2.2.0-alpha7/baseLibrary-2.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.databinding</groupId>
   <artifactId>baseLibrary</artifactId>
-  <version>2.2.0-alpha5</version>
+  <version>2.2.0-alpha7</version>
   <name>Data Binding Base Library</name>
   <description>Shared library between Data Binding runtime lib and compiler</description>
   <url>http://tools.android.com</url>
diff --git a/common/offline-m2/com/android/databinding/compiler/2.2.0-alpha5/compiler-2.2.0-alpha5.jar b/common/offline-m2/com/android/databinding/compiler/2.2.0-alpha7/compiler-2.2.0-alpha7.jar
similarity index 95%
rename from common/offline-m2/com/android/databinding/compiler/2.2.0-alpha5/compiler-2.2.0-alpha5.jar
rename to common/offline-m2/com/android/databinding/compiler/2.2.0-alpha7/compiler-2.2.0-alpha7.jar
index 07b714b..d4b5c91 100644
--- a/common/offline-m2/com/android/databinding/compiler/2.2.0-alpha5/compiler-2.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/databinding/compiler/2.2.0-alpha7/compiler-2.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compiler/2.2.0-alpha5/compiler-2.2.0-alpha5.pom b/common/offline-m2/com/android/databinding/compiler/2.2.0-alpha7/compiler-2.2.0-alpha7.pom
similarity index 95%
rename from common/offline-m2/com/android/databinding/compiler/2.2.0-alpha5/compiler-2.2.0-alpha5.pom
rename to common/offline-m2/com/android/databinding/compiler/2.2.0-alpha7/compiler-2.2.0-alpha7.pom
index e244333..d574a04 100644
--- a/common/offline-m2/com/android/databinding/compiler/2.2.0-alpha5/compiler-2.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/databinding/compiler/2.2.0-alpha7/compiler-2.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.databinding</groupId>
   <artifactId>compiler</artifactId>
-  <version>2.2.0-alpha5</version>
+  <version>2.2.0-alpha7</version>
   <name>Data Binding Annotation Processor</name>
   <description>The annotation processor for Data Binding. Generates binding classes for runtime.</description>
   <url>http://tools.android.com</url>
@@ -27,39 +27,15 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4</artifactId>
-      <version>4.5.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.juniversalchardet</groupId>
-      <artifactId>juniversalchardet</artifactId>
-      <version>1.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.10</version>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>compilerCommon</artifactId>
+      <version>2.2.0-alpha7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.databinding</groupId>
       <artifactId>baseLibrary</artifactId>
-      <version>2.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
+      <version>2.2.0-alpha7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -69,10 +45,34 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.2.0-alpha5</version>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.4</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4</artifactId>
+      <version>4.5.3</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.googlecode.juniversalchardet</groupId>
+      <artifactId>juniversalchardet</artifactId>
+      <version>1.0.3</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/databinding/compilerCommon/2.2.0-alpha5/compilerCommon-2.2.0-alpha5.jar b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha7/compilerCommon-2.2.0-alpha7.jar
similarity index 92%
rename from common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha5/compilerCommon-2.2.0-alpha5.jar
rename to common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha7/compilerCommon-2.2.0-alpha7.jar
index b56da6e..7a499c0 100644
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha5/compilerCommon-2.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha7/compilerCommon-2.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha5/compilerCommon-2.2.0-alpha5.pom b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha7/compilerCommon-2.2.0-alpha7.pom
similarity index 96%
rename from common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha5/compilerCommon-2.2.0-alpha5.pom
rename to common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha7/compilerCommon-2.2.0-alpha7.pom
index 2de8fcf..4b71f8e 100644
--- a/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha5/compilerCommon-2.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/databinding/compilerCommon/2.2.0-alpha7/compilerCommon-2.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.databinding</groupId>
   <artifactId>compilerCommon</artifactId>
-  <version>2.2.0-alpha5</version>
+  <version>2.2.0-alpha7</version>
   <name>Data Binding Compiler Common</name>
   <description>Common library that can be shared between different build tools</description>
   <url>http://tools.android.com</url>
@@ -27,46 +27,46 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>baseLibrary</artifactId>
+      <version>2.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr4</artifactId>
       <version>4.5.3</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.googlecode.juniversalchardet</groupId>
+      <artifactId>juniversalchardet</artifactId>
+      <version>1.0.3</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>17.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.juniversalchardet</groupId>
-      <artifactId>juniversalchardet</artifactId>
-      <version>1.0.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>annotations</artifactId>
       <version>24.5.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>baseLibrary</artifactId>
-      <version>2.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-      <scope>compile</scope>
+      <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/analytics-library/protos/25.2.0-alpha5/protos-25.2.0-alpha5.jar b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha5/protos-25.2.0-alpha5.jar
deleted file mode 100644
index 7e36275..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha5/protos-25.2.0-alpha5.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha7/protos-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha7/protos-25.2.0-alpha7.jar
new file mode 100644
index 0000000..91b7f56
--- /dev/null
+++ b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha7/protos-25.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha5/protos-25.2.0-alpha5.pom b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha7/protos-25.2.0-alpha7.pom
similarity index 96%
rename from common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha5/protos-25.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha7/protos-25.2.0-alpha7.pom
index 7dff5fb..3613f89 100644
--- a/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha5/protos-25.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/analytics-library/protos/25.2.0-alpha7/protos-25.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.analytics-library</groupId>
   <artifactId>protos</artifactId>
-  <version>25.2.0-alpha5</version>
+  <version>25.2.0-alpha7</version>
   <name>Android Tools Analytics Protobufs</name>
   <description>Library containing protobufs for usage analytics.</description>
   <url>http://tools.android.com</url>
diff --git a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha5/shared-25.2.0-alpha5.jar b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha5/shared-25.2.0-alpha5.jar
deleted file mode 100644
index e190016..0000000
--- a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha5/shared-25.2.0-alpha5.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha7/shared-25.2.0-alpha7.jar b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha7/shared-25.2.0-alpha7.jar
new file mode 100644
index 0000000..cc26939
--- /dev/null
+++ b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha7/shared-25.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha5/shared-25.2.0-alpha5.pom b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha7/shared-25.2.0-alpha7.pom
similarity index 92%
rename from common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha5/shared-25.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha7/shared-25.2.0-alpha7.pom
index 9626a8f..8361567 100644
--- a/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha5/shared-25.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/analytics-library/shared/25.2.0-alpha7/shared-25.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.analytics-library</groupId>
   <artifactId>shared</artifactId>
-  <version>25.2.0-alpha5</version>
+  <version>25.2.0-alpha7</version>
   <name>Android Tools Analytics Shared Library</name>
   <description>Helper Library for tracking usage analytics.</description>
   <url>http://tools.android.com</url>
@@ -27,36 +27,42 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools.analytics-library</groupId>
+      <artifactId>protos</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>annotations</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>17.0</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>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>protos</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
       <version>0.28</version>
@@ -64,15 +70,9 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version>
-      <scope>compile</scope>
+      <artifactId>testutils</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha5/tracker-25.2.0-alpha5.jar b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha7/tracker-25.2.0-alpha7.jar
similarity index 71%
rename from common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha5/tracker-25.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha7/tracker-25.2.0-alpha7.jar
index 20ec0ec..5397843 100644
--- a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha5/tracker-25.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha7/tracker-25.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha5/tracker-25.2.0-alpha5.pom b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha7/tracker-25.2.0-alpha7.pom
similarity index 91%
rename from common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha5/tracker-25.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha7/tracker-25.2.0-alpha7.pom
index 24d18e2..cb3cd6c 100644
--- a/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha5/tracker-25.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/analytics-library/tracker/25.2.0-alpha7/tracker-25.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.analytics-library</groupId>
   <artifactId>tracker</artifactId>
-  <version>25.2.0-alpha5</version>
+  <version>25.2.0-alpha7</version>
   <name>Android Tools Analytics Tracker</name>
   <description>Library for tracking usage analytics.</description>
   <url>http://tools.android.com</url>
@@ -27,40 +27,28 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>test</scope>
+      <artifactId>annotations</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>common</artifactId>
-      <version>25.2.0-alpha5</version>
+      <version>25.2.0-alpha7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.analytics-library</groupId>
       <artifactId>protos</artifactId>
-      <version>25.2.0-alpha5</version>
+      <version>25.2.0-alpha7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
+      <groupId>com.android.tools.analytics-library</groupId>
+      <artifactId>shared</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>
@@ -69,16 +57,28 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-alpha5</version>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>17.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>shared</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>0.28</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/annotations/25.2.0-alpha5/annotations-25.2.0-alpha5.jar b/common/offline-m2/com/android/tools/annotations/25.2.0-alpha7/annotations-25.2.0-alpha7.jar
similarity index 80%
rename from common/offline-m2/com/android/tools/annotations/25.2.0-alpha5/annotations-25.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/annotations/25.2.0-alpha7/annotations-25.2.0-alpha7.jar
index c544492..5a46446 100644
--- a/common/offline-m2/com/android/tools/annotations/25.2.0-alpha5/annotations-25.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/annotations/25.2.0-alpha7/annotations-25.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/annotations/25.2.0-alpha5/annotations-25.2.0-alpha5.pom b/common/offline-m2/com/android/tools/annotations/25.2.0-alpha7/annotations-25.2.0-alpha7.pom
similarity index 96%
rename from common/offline-m2/com/android/tools/annotations/25.2.0-alpha5/annotations-25.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/annotations/25.2.0-alpha7/annotations-25.2.0-alpha7.pom
index e657353..a332018 100644
--- a/common/offline-m2/com/android/tools/annotations/25.2.0-alpha5/annotations-25.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/annotations/25.2.0-alpha7/annotations-25.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>annotations</artifactId>
-  <version>25.2.0-alpha5</version>
+  <version>25.2.0-alpha7</version>
   <name>Android Tools Annotations library</name>
   <description>annotations used throughout the Android tools libraries.</description>
   <url>http://tools.android.com</url>
diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha5/builder-model-2.2.0-alpha5.jar b/common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha7/builder-model-2.2.0-alpha7.jar
similarity index 74%
rename from common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha5/builder-model-2.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha7/builder-model-2.2.0-alpha7.jar
index 5ef9531..7060e33 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha5/builder-model-2.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha7/builder-model-2.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha5/builder-model-2.2.0-alpha5.pom b/common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha7/builder-model-2.2.0-alpha7.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha5/builder-model-2.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha7/builder-model-2.2.0-alpha7.pom
index 3474e78..8f21312 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha5/builder-model-2.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/build/builder-model/2.2.0-alpha7/builder-model-2.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder-model</artifactId>
-  <version>2.2.0-alpha5</version>
+  <version>2.2.0-alpha7</version>
   <name>Android Builder Model library</name>
   <description>Model for the Builder library.</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>annotations</artifactId>
-      <version>25.2.0-alpha5</version>
+      <version>25.2.0-alpha7</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha5/builder-test-api-2.2.0-alpha5.jar b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha7/builder-test-api-2.2.0-alpha7.jar
similarity index 77%
rename from common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha5/builder-test-api-2.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha7/builder-test-api-2.2.0-alpha7.jar
index dda4722..b9dac35 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha5/builder-test-api-2.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha7/builder-test-api-2.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha5/builder-test-api-2.2.0-alpha5.pom b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha7/builder-test-api-2.2.0-alpha7.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha5/builder-test-api-2.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha7/builder-test-api-2.2.0-alpha7.pom
index c4aaaa7..251f80e 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha5/builder-test-api-2.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/2.2.0-alpha7/builder-test-api-2.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder-test-api</artifactId>
-  <version>2.2.0-alpha5</version>
+  <version>2.2.0-alpha7</version>
   <name>Android Builder Test API library</name>
   <description>API for the Test extension point in the Builder library.</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools.ddms</groupId>
       <artifactId>ddmlib</artifactId>
-      <version>25.2.0-alpha5</version>
+      <version>25.2.0-alpha7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/offline-m2/com/android/tools/build/builder/2.2.0-alpha5/builder-2.2.0-alpha5.jar b/common/offline-m2/com/android/tools/build/builder/2.2.0-alpha7/builder-2.2.0-alpha7.jar
similarity index 90%
rename from common/offline-m2/com/android/tools/build/builder/2.2.0-alpha5/builder-2.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/build/builder/2.2.0-alpha7/builder-2.2.0-alpha7.jar
index 16cdbd2..b887645 100644
--- a/common/offline-m2/com/android/tools/build/builder/2.2.0-alpha5/builder-2.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/build/builder/2.2.0-alpha7/builder-2.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder/2.2.0-alpha5/builder-2.2.0-alpha5.pom b/common/offline-m2/com/android/tools/build/builder/2.2.0-alpha7/builder-2.2.0-alpha7.pom
similarity index 90%
rename from common/offline-m2/com/android/tools/build/builder/2.2.0-alpha5/builder-2.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/build/builder/2.2.0-alpha7/builder-2.2.0-alpha7.pom
index 85141ac..370d315 100644
--- a/common/offline-m2/com/android/tools/build/builder/2.2.0-alpha5/builder-2.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/build/builder/2.2.0-alpha7/builder-2.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder</artifactId>
-  <version>2.2.0-alpha5</version>
+  <version>2.2.0-alpha7</version>
   <name>Android Builder library</name>
   <description>Library to build Android applications.</description>
   <url>http://tools.android.com</url>
@@ -27,16 +27,46 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-model</artifactId>
+      <version>2.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-test-api</artifactId>
+      <version>2.2.0-alpha7</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>test</scope>
+      <artifactId>sdklib</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdk-common</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>manifest-merger</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.ddms</groupId>
+      <artifactId>ddmlib</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.jack</groupId>
@@ -45,6 +75,48 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.jill</groupId>
+      <artifactId>jill-api</artifactId>
+      <version>0.10.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.analytics-library</groupId>
+      <artifactId>protos</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.analytics-library</groupId>
+      <artifactId>shared</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.analytics-library</groupId>
+      <artifactId>tracker</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup</groupId>
+      <artifactId>javawriter</artifactId>
+      <version>2.5.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk15on</artifactId>
+      <version>1.48</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+      <version>1.48</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
       <version>5.0.4</version>
@@ -57,58 +129,16 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>tracker</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>manifest-merger</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.jill</groupId>
-      <artifactId>jill-api</artifactId>
-      <version>0.10.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>protos</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.truth</groupId>
@@ -117,39 +147,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.squareup</groupId>
-      <artifactId>javawriter</artifactId>
-      <version>2.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.analytics-library</groupId>
-      <artifactId>shared</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
+      <artifactId>testutils</artifactId>
+      <version>25.2.0-alpha7</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha5/gradle-api-2.2.0-alpha5.jar b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha7/gradle-api-2.2.0-alpha7.jar
similarity index 72%
rename from common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha5/gradle-api-2.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha7/gradle-api-2.2.0-alpha7.jar
index 5f9ca1c..29bf4fe 100644
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha5/gradle-api-2.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha7/gradle-api-2.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha5/gradle-api-2.2.0-alpha5.pom b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha7/gradle-api-2.2.0-alpha7.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha5/gradle-api-2.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha7/gradle-api-2.2.0-alpha7.pom
index 7cf2c22..ff8d83b 100644
--- a/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha5/gradle-api-2.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-api/2.2.0-alpha7/gradle-api-2.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>gradle-api</artifactId>
-  <version>2.2.0-alpha5</version>
+  <version>2.2.0-alpha7</version>
   <name>Android Gradle API</name>
   <description>APIs to customize Android Gradle Builds</description>
   <url>http://tools.android.com</url>
@@ -27,6 +27,12 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-model</artifactId>
+      <version>2.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>17.0</version>
@@ -38,11 +44,5 @@
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha5/gradle-core-2.2.0-alpha5.jar b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha7/gradle-core-2.2.0-alpha7.jar
similarity index 68%
rename from common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha5/gradle-core-2.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha7/gradle-core-2.2.0-alpha7.jar
index ba8f7a1..b930545 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha5/gradle-core-2.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha7/gradle-core-2.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha5/gradle-core-2.2.0-alpha5.pom b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha7/gradle-core-2.2.0-alpha7.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha5/gradle-core-2.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha7/gradle-core-2.2.0-alpha7.pom
index ed4549c..93dc753 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha5/gradle-core-2.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-core/2.2.0-alpha7/gradle-core-2.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>gradle-core</artifactId>
-  <version>2.2.0-alpha5</version>
+  <version>2.2.0-alpha7</version>
   <name>Core Library for Android Gradle Plug-in</name>
   <description>Core library to build Android Gradle plugin.</description>
   <url>http://tools.android.com</url>
@@ -27,15 +27,81 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint</artifactId>
-      <version>25.2.0-alpha5</version>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder</artifactId>
+      <version>2.2.0-alpha7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.jsoup</groupId>
-      <artifactId>jsoup</artifactId>
-      <version>1.6.3</version>
+      <groupId>com.android.tools.lint</groupId>
+      <artifactId>lint</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>transform-api</artifactId>
+      <version>2.0.0-deprecated-use-gradle-api</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>gradle-api</artifactId>
+      <version>2.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.databinding</groupId>
+      <artifactId>compilerCommon</artifactId>
+      <version>2.2.0-alpha7</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>org.ow2.asm</groupId>
+      <artifactId>asm-commons</artifactId>
+      <version>5.0.4</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.jacoco</groupId>
+      <artifactId>org.jacoco.core</artifactId>
+      <version>0.7.5.201505241946</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>net.sf.jopt-simple</groupId>
+      <artifactId>jopt-simple</artifactId>
+      <version>4.9</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>tools.base.instant-run</groupId>
+      <artifactId>instant-run-annotations</artifactId>
+      <version>unspecified</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -51,46 +117,16 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-alpha5</version>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>0.28</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>5.0.4</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.tools.build</groupId>
-      <artifactId>transform-api</artifactId>
-      <version>2.0.0-deprecated-use-gradle-api</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>com.android.tools.build</groupId>
-      <artifactId>builder</artifactId>
-      <version>2.2.0-alpha5</version>
-      <scope>compile</scope>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -99,57 +135,21 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>net.sf.jopt-simple</groupId>
-      <artifactId>jopt-simple</artifactId>
-      <version>4.9</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.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</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.build</groupId>
-      <artifactId>gradle-api</artifactId>
-      <version>2.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>tools.base</groupId>
       <artifactId>project-test-lib</artifactId>
       <version>unspecified</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>tools.base.instant-run</groupId>
-      <artifactId>instant-run-annotations</artifactId>
-      <version>unspecified</version>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>25.2.0-alpha7</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.databinding</groupId>
-      <artifactId>compilerCommon</artifactId>
-      <version>2.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
+      <groupId>org.jsoup</groupId>
+      <artifactId>jsoup</artifactId>
+      <version>1.6.3</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha5/gradle-experimental-0.8.0-alpha5.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha5/gradle-experimental-0.8.0-alpha5.jar
deleted file mode 100644
index d65fc4a..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha5/gradle-experimental-0.8.0-alpha5.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha7/gradle-experimental-0.8.0-alpha7.jar b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha7/gradle-experimental-0.8.0-alpha7.jar
new file mode 100644
index 0000000..0d54501
--- /dev/null
+++ b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha7/gradle-experimental-0.8.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha5/gradle-experimental-0.8.0-alpha5.pom b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha7/gradle-experimental-0.8.0-alpha7.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha5/gradle-experimental-0.8.0-alpha5.pom
rename to common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha7/gradle-experimental-0.8.0-alpha7.pom
index d620773..e270ec8 100644
--- a/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha5/gradle-experimental-0.8.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-experimental/0.8.0-alpha7/gradle-experimental-0.8.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>gradle-experimental</artifactId>
-  <version>0.8.0-alpha5</version>
+  <version>0.8.0-alpha7</version>
   <name>Gradle Plug-in for Android Using Component Model</name>
   <description>Gradle plug-in to build Android applications.</description>
   <url>http://tools.android.com</url>
@@ -27,18 +27,18 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>gradle-core</artifactId>
+      <version>2.2.0-alpha7</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>gradle-core</artifactId>
-      <version>2.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>tools.base</groupId>
       <artifactId>project-test-lib</artifactId>
       <version>unspecified</version>
diff --git a/common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha5/gradle-2.2.0-alpha5.jar b/common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha5/gradle-2.2.0-alpha5.jar
deleted file mode 100644
index 969bdf3..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha5/gradle-2.2.0-alpha5.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha7/gradle-2.2.0-alpha7.jar b/common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha7/gradle-2.2.0-alpha7.jar
new file mode 100644
index 0000000..f7c9c45
--- /dev/null
+++ b/common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha7/gradle-2.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha5/gradle-2.2.0-alpha5.pom b/common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha7/gradle-2.2.0-alpha7.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha5/gradle-2.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha7/gradle-2.2.0-alpha7.pom
index 6c4db5e..89c13dc 100644
--- a/common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha5/gradle-2.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/build/gradle/2.2.0-alpha7/gradle-2.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>gradle</artifactId>
-  <version>2.2.0-alpha5</version>
+  <version>2.2.0-alpha7</version>
   <name>Gradle Plug-in for Android</name>
   <description>Gradle plug-in to build Android applications.</description>
   <url>http://tools.android.com</url>
@@ -27,18 +27,18 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>gradle-core</artifactId>
+      <version>2.2.0-alpha7</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>gradle-core</artifactId>
-      <version>2.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
       <version>0.28</version>
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha5/manifest-merger-25.2.0-alpha5.jar b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha7/manifest-merger-25.2.0-alpha7.jar
similarity index 91%
rename from common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha5/manifest-merger-25.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha7/manifest-merger-25.2.0-alpha7.jar
index e8eeaf4..f11ec6a 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha5/manifest-merger-25.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha7/manifest-merger-25.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha5/manifest-merger-25.2.0-alpha5.pom b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha7/manifest-merger-25.2.0-alpha7.pom
similarity index 92%
rename from common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha5/manifest-merger-25.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha7/manifest-merger-25.2.0-alpha7.pom
index 10b109c..47a728c 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha5/manifest-merger-25.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/25.2.0-alpha7/manifest-merger-25.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>manifest-merger</artifactId>
-  <version>25.2.0-alpha5</version>
+  <version>25.2.0-alpha7</version>
   <name>Android Tools Manifest Merger library</name>
   <description>A Library to merge Android manifests.</description>
   <url>http://tools.android.com</url>
@@ -27,10 +27,22 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdklib</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdk-common</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>net.sf.kxml</groupId>
@@ -39,30 +51,18 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-alpha5</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>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</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/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 1643155..0fb97be 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-alpha5/common-25.2.0-alpha5.jar b/common/offline-m2/com/android/tools/common/25.2.0-alpha7/common-25.2.0-alpha7.jar
similarity index 66%
rename from common/offline-m2/com/android/tools/common/25.2.0-alpha5/common-25.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/common/25.2.0-alpha7/common-25.2.0-alpha7.jar
index 440d4eb..9c78c69 100644
--- a/common/offline-m2/com/android/tools/common/25.2.0-alpha5/common-25.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/common/25.2.0-alpha7/common-25.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/common/25.2.0-alpha5/common-25.2.0-alpha5.pom b/common/offline-m2/com/android/tools/common/25.2.0-alpha7/common-25.2.0-alpha7.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/common/25.2.0-alpha5/common-25.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/common/25.2.0-alpha7/common-25.2.0-alpha7.pom
index 1409bfc..a7daafd 100644
--- a/common/offline-m2/com/android/tools/common/25.2.0-alpha5/common-25.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/common/25.2.0-alpha7/common-25.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>common</artifactId>
-  <version>25.2.0-alpha5</version>
+  <version>25.2.0-alpha7</version>
   <name>Android Tools common library</name>
   <description>common library used by other Android tools libraries.</description>
   <url>http://tools.android.com</url>
@@ -27,6 +27,12 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>annotations</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>17.0</version>
@@ -44,11 +50,5 @@
       <version>0.28</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>annotations</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha5/ddmlib-25.2.0-alpha5.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha7/ddmlib-25.2.0-alpha7.jar
similarity index 92%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha5/ddmlib-25.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha7/ddmlib-25.2.0-alpha7.jar
index a1775fc..93a841c 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha5/ddmlib-25.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha7/ddmlib-25.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha5/ddmlib-25.2.0-alpha5.pom b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha7/ddmlib-25.2.0-alpha7.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha5/ddmlib-25.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha7/ddmlib-25.2.0-alpha7.pom
index 6e2e5a8..def79bc 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha5/ddmlib-25.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/25.2.0-alpha7/ddmlib-25.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.ddms</groupId>
   <artifactId>ddmlib</artifactId>
-  <version>25.2.0-alpha5</version>
+  <version>25.2.0-alpha7</version>
   <name>Android Tools ddmlib</name>
   <description>Library providing APIs to talk to Android devices</description>
   <url>http://tools.android.com</url>
@@ -27,10 +27,10 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>net.sf.kxml</groupId>
@@ -39,16 +39,16 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>3.1</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/dvlib/25.2.0-alpha5/dvlib-25.2.0-alpha5.jar b/common/offline-m2/com/android/tools/dvlib/25.2.0-alpha7/dvlib-25.2.0-alpha7.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/dvlib/25.2.0-alpha5/dvlib-25.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/dvlib/25.2.0-alpha7/dvlib-25.2.0-alpha7.jar
index c1b1c48..3555bdc 100644
--- a/common/offline-m2/com/android/tools/dvlib/25.2.0-alpha5/dvlib-25.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/dvlib/25.2.0-alpha7/dvlib-25.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/dvlib/25.2.0-alpha5/dvlib-25.2.0-alpha5.pom b/common/offline-m2/com/android/tools/dvlib/25.2.0-alpha7/dvlib-25.2.0-alpha7.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/dvlib/25.2.0-alpha5/dvlib-25.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/dvlib/25.2.0-alpha7/dvlib-25.2.0-alpha7.pom
index aeddf98..6f545b4 100644
--- a/common/offline-m2/com/android/tools/dvlib/25.2.0-alpha5/dvlib-25.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/dvlib/25.2.0-alpha7/dvlib-25.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>dvlib</artifactId>
-  <version>25.2.0-alpha5</version>
+  <version>25.2.0-alpha7</version>
   <name>Android Tools dvlib</name>
   <description>A Library to manage the Android device database XML files.</description>
   <url>http://tools.android.com</url>
@@ -27,16 +27,16 @@
   </scm>
   <dependencies>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/jack/jack-api/0.11.0/jack-api-0.11.0.jar b/common/offline-m2/com/android/tools/jack/jack-api/0.11.0/jack-api-0.11.0.jar
index c79ede5..eed0981 100644
--- a/common/offline-m2/com/android/tools/jack/jack-api/0.11.0/jack-api-0.11.0.jar
+++ b/common/offline-m2/com/android/tools/jack/jack-api/0.11.0/jack-api-0.11.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 0778cca..621b4f3 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-alpha5/layoutlib-api-25.2.0-alpha5.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha7/layoutlib-api-25.2.0-alpha7.jar
similarity index 88%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha5/layoutlib-api-25.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha7/layoutlib-api-25.2.0-alpha7.jar
index 150892b..4b1f9e3 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha5/layoutlib-api-25.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha7/layoutlib-api-25.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha5/layoutlib-api-25.2.0-alpha5.pom b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha7/layoutlib-api-25.2.0-alpha7.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha5/layoutlib-api-25.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha7/layoutlib-api-25.2.0-alpha7.pom
index c57df68..89be7bf 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha5/layoutlib-api-25.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/25.2.0-alpha7/layoutlib-api-25.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.layoutlib</groupId>
   <artifactId>layoutlib-api</artifactId>
-  <version>25.2.0-alpha5</version>
+  <version>25.2.0-alpha7</version>
   <name>Android Tools layoutlib-api</name>
   <description>Library to use the rendering library for Android layouts: layoutlib</description>
   <url>http://tools.android.com</url>
@@ -27,10 +27,10 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>net.sf.kxml</groupId>
@@ -40,14 +40,8 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
       <artifactId>annotations</artifactId>
-      <version>25.2.0-alpha5</version>
+      <version>25.2.0-alpha7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -56,5 +50,11 @@
       <version>12.0</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/lint/lint-api/25.2.0-alpha5/lint-api-25.2.0-alpha5.jar b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha7/lint-api-25.2.0-alpha7.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha5/lint-api-25.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha7/lint-api-25.2.0-alpha7.jar
index 08915d7..8a12bba 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha5/lint-api-25.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha7/lint-api-25.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha5/lint-api-25.2.0-alpha5.pom b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha7/lint-api-25.2.0-alpha7.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha5/lint-api-25.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha7/lint-api-25.2.0-alpha7.pom
index a69d63b..a67b1ad 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha5/lint-api-25.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-api/25.2.0-alpha7/lint-api-25.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint-api</artifactId>
-  <version>25.2.0-alpha5</version>
+  <version>25.2.0-alpha7</version>
   <name>Android Tools Lint API</name>
   <description>API to build lint checks</description>
   <url>http://tools.android.com</url>
@@ -27,9 +27,15 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>5.0.4</version>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdk-common</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-model</artifactId>
+      <version>2.2.0-alpha7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -39,9 +45,15 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>2.2.0-alpha5</version>
+      <groupId>com.android.tools.external.com-intellij</groupId>
+      <artifactId>uast</artifactId>
+      <version>145.597.3</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>5.0.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -50,17 +62,5 @@
       <version>5.0.4</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools.external.com-intellij</groupId>
-      <artifactId>uast</artifactId>
-      <version>145.597.3</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha5/lint-checks-25.2.0-alpha5.jar b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha7/lint-checks-25.2.0-alpha7.jar
similarity index 84%
rename from common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha5/lint-checks-25.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha7/lint-checks-25.2.0-alpha7.jar
index e69a684..dd029a2 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha5/lint-checks-25.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha7/lint-checks-25.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha5/lint-checks-25.2.0-alpha5.pom b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha7/lint-checks-25.2.0-alpha7.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha5/lint-checks-25.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha7/lint-checks-25.2.0-alpha7.pom
index ea4657e..b56d613 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha5/lint-checks-25.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/25.2.0-alpha7/lint-checks-25.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint-checks</artifactId>
-  <version>25.2.0-alpha5</version>
+  <version>25.2.0-alpha7</version>
   <name>Android Lint Checks</name>
   <description>Checks for Android Lint</description>
   <url>http://tools.android.com</url>
@@ -27,15 +27,15 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm-analysis</artifactId>
-      <version>5.0.4</version>
+      <groupId>com.android.tools.lint</groupId>
+      <artifactId>lint-api</artifactId>
+      <version>25.2.0-alpha7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-api</artifactId>
-      <version>25.2.0-alpha5</version>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-analysis</artifactId>
+      <version>5.0.4</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha5/lint-25.2.0-alpha5.jar b/common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha7/lint-25.2.0-alpha7.jar
similarity index 74%
rename from common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha5/lint-25.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha7/lint-25.2.0-alpha7.jar
index 194ef97..aa6e2d5 100644
--- a/common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha5/lint-25.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha7/lint-25.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha5/lint-25.2.0-alpha5.pom b/common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha7/lint-25.2.0-alpha7.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha5/lint-25.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha7/lint-25.2.0-alpha7.pom
index 2e1914d..b21a497 100644
--- a/common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha5/lint-25.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/lint/lint/25.2.0-alpha7/lint-25.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint</artifactId>
-  <version>25.2.0-alpha5</version>
+  <version>25.2.0-alpha7</version>
   <name>Android Lint Tool</name>
   <description>Lint tools. Both a Command line tool and a library to add lint features to other tools</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools.lint</groupId>
       <artifactId>lint-checks</artifactId>
-      <version>25.2.0-alpha5</version>
+      <version>25.2.0-alpha7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/offline-m2/com/android/tools/repository/25.2.0-alpha5/repository-25.2.0-alpha5.jar b/common/offline-m2/com/android/tools/repository/25.2.0-alpha7/repository-25.2.0-alpha7.jar
similarity index 87%
rename from common/offline-m2/com/android/tools/repository/25.2.0-alpha5/repository-25.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/repository/25.2.0-alpha7/repository-25.2.0-alpha7.jar
index 7eb5d77..9a2f428 100644
--- a/common/offline-m2/com/android/tools/repository/25.2.0-alpha5/repository-25.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/repository/25.2.0-alpha7/repository-25.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/repository/25.2.0-alpha5/repository-25.2.0-alpha5.pom b/common/offline-m2/com/android/tools/repository/25.2.0-alpha7/repository-25.2.0-alpha7.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/repository/25.2.0-alpha5/repository-25.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/repository/25.2.0-alpha7/repository-25.2.0-alpha7.pom
index 3bb6839..d36bbd6 100644
--- a/common/offline-m2/com/android/tools/repository/25.2.0-alpha5/repository-25.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/repository/25.2.0-alpha7/repository-25.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>repository</artifactId>
-  <version>25.2.0-alpha5</version>
+  <version>25.2.0-alpha7</version>
   <name>Android Tools repository</name>
   <description>A library for downloading and managing package repositories</description>
   <url>http://tools.android.com</url>
@@ -27,15 +27,15 @@
   </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-alpha5</version>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+      <version>1.8.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -45,10 +45,10 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-compress</artifactId>
-      <version>1.8.1</version>
-      <scope>compile</scope>
+      <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/sdk-common/25.2.0-alpha5/sdk-common-25.2.0-alpha5.jar b/common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha7/sdk-common-25.2.0-alpha7.jar
similarity index 82%
rename from common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha5/sdk-common-25.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha7/sdk-common-25.2.0-alpha7.jar
index ea9f890..084e080 100644
--- a/common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha5/sdk-common-25.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha7/sdk-common-25.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha5/sdk-common-25.2.0-alpha5.pom b/common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha7/sdk-common-25.2.0-alpha7.pom
similarity index 92%
rename from common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha5/sdk-common-25.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha7/sdk-common-25.2.0-alpha7.pom
index 4972e31..1ec9788 100644
--- a/common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha5/sdk-common-25.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/sdk-common/25.2.0-alpha7/sdk-common-25.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>sdk-common</artifactId>
-  <version>25.2.0-alpha5</version>
+  <version>25.2.0-alpha7</version>
   <name>Android Tools sdk-common library</name>
   <description>sdk-common library used by other Android tools libraries.</description>
   <url>http://tools.android.com</url>
@@ -27,58 +27,52 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdklib</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>25.2.0-alpha5</version>
-      <scope>test</scope>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-test-api</artifactId>
+      <version>2.2.0-alpha7</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>builder-model</artifactId>
-      <version>2.2.0-alpha5</version>
+      <version>2.2.0-alpha7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.48</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>3.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
       <version>1.48</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>25.2.0-alpha5</version>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+      <version>1.48</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>2.2.0-alpha5</version>
-      <scope>compile</scope>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>25.2.0-alpha7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>3.3</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
@@ -86,5 +80,11 @@
       <version>1.9.5</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/sdklib/25.2.0-alpha5/sdklib-25.2.0-alpha5.jar b/common/offline-m2/com/android/tools/sdklib/25.2.0-alpha7/sdklib-25.2.0-alpha7.jar
similarity index 88%
rename from common/offline-m2/com/android/tools/sdklib/25.2.0-alpha5/sdklib-25.2.0-alpha5.jar
rename to common/offline-m2/com/android/tools/sdklib/25.2.0-alpha7/sdklib-25.2.0-alpha7.jar
index fa4092f..8c817e2 100644
--- a/common/offline-m2/com/android/tools/sdklib/25.2.0-alpha5/sdklib-25.2.0-alpha5.jar
+++ b/common/offline-m2/com/android/tools/sdklib/25.2.0-alpha7/sdklib-25.2.0-alpha7.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdklib/25.2.0-alpha5/sdklib-25.2.0-alpha5.pom b/common/offline-m2/com/android/tools/sdklib/25.2.0-alpha7/sdklib-25.2.0-alpha7.pom
similarity index 93%
rename from common/offline-m2/com/android/tools/sdklib/25.2.0-alpha5/sdklib-25.2.0-alpha5.pom
rename to common/offline-m2/com/android/tools/sdklib/25.2.0-alpha7/sdklib-25.2.0-alpha7.pom
index a2611d5..3417a44 100644
--- a/common/offline-m2/com/android/tools/sdklib/25.2.0-alpha5/sdklib-25.2.0-alpha5.pom
+++ b/common/offline-m2/com/android/tools/sdklib/25.2.0-alpha7/sdklib-25.2.0-alpha7.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>sdklib</artifactId>
-  <version>25.2.0-alpha5</version>
+  <version>25.2.0-alpha7</version>
   <name>Android Tools sdklib</name>
   <description>A library to parse and download the Android SDK.</description>
   <url>http://tools.android.com</url>
@@ -27,33 +27,21 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.1.1</version>
+      <groupId>com.android.tools.layoutlib</groupId>
+      <artifactId>layoutlib-api</artifactId>
+      <version>25.2.0-alpha7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>dvlib</artifactId>
-      <version>25.2.0-alpha5</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.layoutlib</groupId>
-      <artifactId>layoutlib-api</artifactId>
-      <version>25.2.0-alpha5</version>
+      <version>25.2.0-alpha7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>repository</artifactId>
-      <version>25.2.0-alpha5</version>
+      <version>25.2.0-alpha7</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -70,9 +58,21 @@
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.1.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
       <version>4.1</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>