diff --git a/common/offline-m2/com/android/tools/annotations/24.2.1/annotations-24.2.1-sources.jar b/common/offline-m2/com/android/tools/annotations/24.2.2/annotations-24.2.2-sources.jar
similarity index 95%
rename from common/offline-m2/com/android/tools/annotations/24.2.1/annotations-24.2.1-sources.jar
rename to common/offline-m2/com/android/tools/annotations/24.2.2/annotations-24.2.2-sources.jar
index e78c28a..1e84272 100644
--- a/common/offline-m2/com/android/tools/annotations/24.2.1/annotations-24.2.1-sources.jar
+++ b/common/offline-m2/com/android/tools/annotations/24.2.2/annotations-24.2.2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/annotations/24.2.1/annotations-24.2.1.jar b/common/offline-m2/com/android/tools/annotations/24.2.2/annotations-24.2.2.jar
similarity index 80%
rename from common/offline-m2/com/android/tools/annotations/24.2.1/annotations-24.2.1.jar
rename to common/offline-m2/com/android/tools/annotations/24.2.2/annotations-24.2.2.jar
index 6a3038c..1e573e8 100644
--- a/common/offline-m2/com/android/tools/annotations/24.2.1/annotations-24.2.1.jar
+++ b/common/offline-m2/com/android/tools/annotations/24.2.2/annotations-24.2.2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/annotations/24.2.1/annotations-24.2.1.pom b/common/offline-m2/com/android/tools/annotations/24.2.2/annotations-24.2.2.pom
similarity index 96%
rename from common/offline-m2/com/android/tools/annotations/24.2.1/annotations-24.2.1.pom
rename to common/offline-m2/com/android/tools/annotations/24.2.2/annotations-24.2.2.pom
index b937843..1b35e6b 100644
--- a/common/offline-m2/com/android/tools/annotations/24.2.1/annotations-24.2.1.pom
+++ b/common/offline-m2/com/android/tools/annotations/24.2.2/annotations-24.2.2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>annotations</artifactId>
-  <version>24.2.1</version>
+  <version>24.2.2</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/1.2.1/builder-model-1.2.1-sources.jar b/common/offline-m2/com/android/tools/build/builder-model/1.2.2/builder-model-1.2.2-sources.jar
similarity index 98%
rename from common/offline-m2/com/android/tools/build/builder-model/1.2.1/builder-model-1.2.1-sources.jar
rename to common/offline-m2/com/android/tools/build/builder-model/1.2.2/builder-model-1.2.2-sources.jar
index 6e5bfce..8edd0ea 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/1.2.1/builder-model-1.2.1-sources.jar
+++ b/common/offline-m2/com/android/tools/build/builder-model/1.2.2/builder-model-1.2.2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-model/1.2.1/builder-model-1.2.1.jar b/common/offline-m2/com/android/tools/build/builder-model/1.2.2/builder-model-1.2.2.jar
similarity index 76%
rename from common/offline-m2/com/android/tools/build/builder-model/1.2.1/builder-model-1.2.1.jar
rename to common/offline-m2/com/android/tools/build/builder-model/1.2.2/builder-model-1.2.2.jar
index 2f96743..efd6936 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/1.2.1/builder-model-1.2.1.jar
+++ b/common/offline-m2/com/android/tools/build/builder-model/1.2.2/builder-model-1.2.2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-model/1.2.1/builder-model-1.2.1.pom b/common/offline-m2/com/android/tools/build/builder-model/1.2.2/builder-model-1.2.2.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/build/builder-model/1.2.1/builder-model-1.2.1.pom
rename to common/offline-m2/com/android/tools/build/builder-model/1.2.2/builder-model-1.2.2.pom
index aac18af..e07e0c4 100644
--- a/common/offline-m2/com/android/tools/build/builder-model/1.2.1/builder-model-1.2.1.pom
+++ b/common/offline-m2/com/android/tools/build/builder-model/1.2.2/builder-model-1.2.2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder-model</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2</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>24.2.1</version>
+      <version>24.2.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/1.2.1/builder-test-api-1.2.1-sources.jar b/common/offline-m2/com/android/tools/build/builder-test-api/1.2.2/builder-test-api-1.2.2-sources.jar
similarity index 96%
rename from common/offline-m2/com/android/tools/build/builder-test-api/1.2.1/builder-test-api-1.2.1-sources.jar
rename to common/offline-m2/com/android/tools/build/builder-test-api/1.2.2/builder-test-api-1.2.2-sources.jar
index 5136124..b685b96 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/1.2.1/builder-test-api-1.2.1-sources.jar
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/1.2.2/builder-test-api-1.2.2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/1.2.1/builder-test-api-1.2.1.jar b/common/offline-m2/com/android/tools/build/builder-test-api/1.2.2/builder-test-api-1.2.2.jar
similarity index 78%
rename from common/offline-m2/com/android/tools/build/builder-test-api/1.2.1/builder-test-api-1.2.1.jar
rename to common/offline-m2/com/android/tools/build/builder-test-api/1.2.2/builder-test-api-1.2.2.jar
index 0e7f633..af22c7e 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/1.2.1/builder-test-api-1.2.1.jar
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/1.2.2/builder-test-api-1.2.2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder-test-api/1.2.1/builder-test-api-1.2.1.pom b/common/offline-m2/com/android/tools/build/builder-test-api/1.2.2/builder-test-api-1.2.2.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/builder-test-api/1.2.1/builder-test-api-1.2.1.pom
rename to common/offline-m2/com/android/tools/build/builder-test-api/1.2.2/builder-test-api-1.2.2.pom
index f6e968a..4755d06 100644
--- a/common/offline-m2/com/android/tools/build/builder-test-api/1.2.1/builder-test-api-1.2.1.pom
+++ b/common/offline-m2/com/android/tools/build/builder-test-api/1.2.2/builder-test-api-1.2.2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder-test-api</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2</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>
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>com.android.tools.ddms</groupId>
       <artifactId>ddmlib</artifactId>
-      <version>24.2.1</version>
+      <version>24.2.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/build/builder/1.2.1/builder-1.2.1-sources.jar b/common/offline-m2/com/android/tools/build/builder/1.2.2/builder-1.2.2-sources.jar
similarity index 91%
rename from common/offline-m2/com/android/tools/build/builder/1.2.1/builder-1.2.1-sources.jar
rename to common/offline-m2/com/android/tools/build/builder/1.2.2/builder-1.2.2-sources.jar
index 31ebe72..0ae5d5a 100644
--- a/common/offline-m2/com/android/tools/build/builder/1.2.1/builder-1.2.1-sources.jar
+++ b/common/offline-m2/com/android/tools/build/builder/1.2.2/builder-1.2.2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder/1.2.1/builder-1.2.1.jar b/common/offline-m2/com/android/tools/build/builder/1.2.2/builder-1.2.2.jar
similarity index 87%
rename from common/offline-m2/com/android/tools/build/builder/1.2.1/builder-1.2.1.jar
rename to common/offline-m2/com/android/tools/build/builder/1.2.2/builder-1.2.2.jar
index e9fa52d..2799ebe 100644
--- a/common/offline-m2/com/android/tools/build/builder/1.2.1/builder-1.2.1.jar
+++ b/common/offline-m2/com/android/tools/build/builder/1.2.2/builder-1.2.2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/builder/1.2.1/builder-1.2.1.pom b/common/offline-m2/com/android/tools/build/builder/1.2.2/builder-1.2.2.pom
similarity index 92%
rename from common/offline-m2/com/android/tools/build/builder/1.2.1/builder-1.2.1.pom
rename to common/offline-m2/com/android/tools/build/builder/1.2.2/builder-1.2.2.pom
index 4ad16d8..60ca5fb 100644
--- a/common/offline-m2/com/android/tools/build/builder/1.2.1/builder-1.2.1.pom
+++ b/common/offline-m2/com/android/tools/build/builder/1.2.2/builder-1.2.2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>builder</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2</version>
   <name>Android Builder library</name>
   <description>Library to build Android applications.</description>
   <url>http://tools.android.com</url>
@@ -27,9 +27,9 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>1.2.1</version>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdk-common</artifactId>
+      <version>24.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -40,9 +40,9 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>sdklib</artifactId>
-      <version>24.2.1</version>
-      <scope>compile</scope>
+      <artifactId>testutils</artifactId>
+      <version>24.2.2</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
@@ -51,9 +51,9 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.ddms</groupId>
-      <artifactId>ddmlib</artifactId>
-      <version>24.2.1</version>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-test-api</artifactId>
+      <version>1.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -69,27 +69,27 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>24.2.1</version>
+      <groupId>com.android.tools.ddms</groupId>
+      <artifactId>ddmlib</artifactId>
+      <version>24.2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-model</artifactId>
+      <version>1.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>24.2.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>sdk-common</artifactId>
-      <version>24.2.1</version>
+      <artifactId>common</artifactId>
+      <version>24.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.android.tools.build</groupId>
       <artifactId>manifest-merger</artifactId>
-      <version>24.2.1</version>
+      <version>24.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -99,6 +99,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>sdklib</artifactId>
+      <version>24.2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
       <version>5.0.3</version>
@@ -116,11 +122,5 @@
       <version>1.48</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>1.2.1</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/1.2.1/gradle-core-1.2.1.jar b/common/offline-m2/com/android/tools/build/gradle-core/1.2.1/gradle-core-1.2.1.jar
deleted file mode 100644
index d3b3af9..0000000
--- a/common/offline-m2/com/android/tools/build/gradle-core/1.2.1/gradle-core-1.2.1.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/1.2.1/gradle-core-1.2.1-sources.jar b/common/offline-m2/com/android/tools/build/gradle-core/1.2.2/gradle-core-1.2.2-sources.jar
similarity index 89%
rename from common/offline-m2/com/android/tools/build/gradle-core/1.2.1/gradle-core-1.2.1-sources.jar
rename to common/offline-m2/com/android/tools/build/gradle-core/1.2.2/gradle-core-1.2.2-sources.jar
index 90dc344..d2d5f0b 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/1.2.1/gradle-core-1.2.1-sources.jar
+++ b/common/offline-m2/com/android/tools/build/gradle-core/1.2.2/gradle-core-1.2.2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/1.2.2/gradle-core-1.2.2.jar b/common/offline-m2/com/android/tools/build/gradle-core/1.2.2/gradle-core-1.2.2.jar
new file mode 100644
index 0000000..01a584a
--- /dev/null
+++ b/common/offline-m2/com/android/tools/build/gradle-core/1.2.2/gradle-core-1.2.2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle-core/1.2.1/gradle-core-1.2.1.pom b/common/offline-m2/com/android/tools/build/gradle-core/1.2.2/gradle-core-1.2.2.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/gradle-core/1.2.1/gradle-core-1.2.1.pom
rename to common/offline-m2/com/android/tools/build/gradle-core/1.2.2/gradle-core-1.2.2.pom
index f801324..d83d536 100644
--- a/common/offline-m2/com/android/tools/build/gradle-core/1.2.1/gradle-core-1.2.1.pom
+++ b/common/offline-m2/com/android/tools/build/gradle-core/1.2.2/gradle-core-1.2.2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>gradle-core</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2</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,9 +27,9 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder</artifactId>
-      <version>1.2.1</version>
+      <groupId>com.android.tools.lint</groupId>
+      <artifactId>lint</artifactId>
+      <version>24.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -39,27 +39,27 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>tools.base</groupId>
+      <artifactId>project-test-lib</artifactId>
+      <version>unspecified</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>net.sf.proguard</groupId>
       <artifactId>proguard-gradle</artifactId>
       <version>5.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint</artifactId>
-      <version>24.2.1</version>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder</artifactId>
+      <version>1.2.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/common/offline-m2/com/android/tools/build/gradle/1.2.1/gradle-1.2.1.jar b/common/offline-m2/com/android/tools/build/gradle/1.2.1/gradle-1.2.1.jar
deleted file mode 100644
index 69dbb0b..0000000
--- a/common/offline-m2/com/android/tools/build/gradle/1.2.1/gradle-1.2.1.jar
+++ /dev/null
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/1.2.1/gradle-1.2.1-sources.jar b/common/offline-m2/com/android/tools/build/gradle/1.2.2/gradle-1.2.2-sources.jar
similarity index 97%
rename from common/offline-m2/com/android/tools/build/gradle/1.2.1/gradle-1.2.1-sources.jar
rename to common/offline-m2/com/android/tools/build/gradle/1.2.2/gradle-1.2.2-sources.jar
index 4d11e15..19cbccc 100644
--- a/common/offline-m2/com/android/tools/build/gradle/1.2.1/gradle-1.2.1-sources.jar
+++ b/common/offline-m2/com/android/tools/build/gradle/1.2.2/gradle-1.2.2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/1.2.2/gradle-1.2.2.jar b/common/offline-m2/com/android/tools/build/gradle/1.2.2/gradle-1.2.2.jar
new file mode 100644
index 0000000..e5b8082
--- /dev/null
+++ b/common/offline-m2/com/android/tools/build/gradle/1.2.2/gradle-1.2.2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/gradle/1.2.1/gradle-1.2.1.pom b/common/offline-m2/com/android/tools/build/gradle/1.2.2/gradle-1.2.2.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/build/gradle/1.2.1/gradle-1.2.1.pom
rename to common/offline-m2/com/android/tools/build/gradle/1.2.2/gradle-1.2.2.pom
index 795d1bd..0616f77 100644
--- a/common/offline-m2/com/android/tools/build/gradle/1.2.1/gradle-1.2.1.pom
+++ b/common/offline-m2/com/android/tools/build/gradle/1.2.2/gradle-1.2.2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>gradle</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2</version>
   <name>Gradle Plug-in for Android</name>
   <description>Gradle plug-in to build Android applications.</description>
   <url>http://tools.android.com</url>
@@ -27,10 +27,10 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>tools.base</groupId>
-      <artifactId>project-test-lib</artifactId>
-      <version>unspecified</version>
-      <scope>test</scope>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>gradle-core</artifactId>
+      <version>1.2.2</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -39,10 +39,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>gradle-core</artifactId>
-      <version>1.2.1</version>
-      <scope>compile</scope>
+      <groupId>tools.base</groupId>
+      <artifactId>project-test-lib</artifactId>
+      <version>unspecified</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/24.2.1/manifest-merger-24.2.1-sources.jar b/common/offline-m2/com/android/tools/build/manifest-merger/24.2.2/manifest-merger-24.2.2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/build/manifest-merger/24.2.1/manifest-merger-24.2.1-sources.jar
rename to common/offline-m2/com/android/tools/build/manifest-merger/24.2.2/manifest-merger-24.2.2-sources.jar
index bb13a4f..8340068 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/24.2.1/manifest-merger-24.2.1-sources.jar
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/24.2.2/manifest-merger-24.2.2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/24.2.1/manifest-merger-24.2.1.jar b/common/offline-m2/com/android/tools/build/manifest-merger/24.2.2/manifest-merger-24.2.2.jar
similarity index 92%
rename from common/offline-m2/com/android/tools/build/manifest-merger/24.2.1/manifest-merger-24.2.1.jar
rename to common/offline-m2/com/android/tools/build/manifest-merger/24.2.2/manifest-merger-24.2.2.jar
index 660bc91..cca5b25 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/24.2.1/manifest-merger-24.2.1.jar
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/24.2.2/manifest-merger-24.2.2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/build/manifest-merger/24.2.1/manifest-merger-24.2.1.pom b/common/offline-m2/com/android/tools/build/manifest-merger/24.2.2/manifest-merger-24.2.2.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/build/manifest-merger/24.2.1/manifest-merger-24.2.1.pom
rename to common/offline-m2/com/android/tools/build/manifest-merger/24.2.2/manifest-merger-24.2.2.pom
index a313018..f29e135 100644
--- a/common/offline-m2/com/android/tools/build/manifest-merger/24.2.1/manifest-merger-24.2.1.pom
+++ b/common/offline-m2/com/android/tools/build/manifest-merger/24.2.2/manifest-merger-24.2.2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.build</groupId>
   <artifactId>manifest-merger</artifactId>
-  <version>24.2.1</version>
+  <version>24.2.2</version>
   <name>Android Tools Manifest Merger library</name>
   <description>A Library to merge Android manifests.</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdk-common</artifactId>
-      <version>24.2.1</version>
+      <version>24.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -39,6 +39,12 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>24.2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.9.5</version>
@@ -47,7 +53,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdklib</artifactId>
-      <version>24.2.1</version>
+      <version>24.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -62,11 +68,5 @@
       <version>2.2.4</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>common</artifactId>
-      <version>24.2.1</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/common/24.2.1/common-24.2.1-sources.jar b/common/offline-m2/com/android/tools/common/24.2.2/common-24.2.2-sources.jar
similarity index 79%
rename from common/offline-m2/com/android/tools/common/24.2.1/common-24.2.1-sources.jar
rename to common/offline-m2/com/android/tools/common/24.2.2/common-24.2.2-sources.jar
index 9a05590..ab2a7a7 100644
--- a/common/offline-m2/com/android/tools/common/24.2.1/common-24.2.1-sources.jar
+++ b/common/offline-m2/com/android/tools/common/24.2.2/common-24.2.2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/common/24.2.1/common-24.2.1.jar b/common/offline-m2/com/android/tools/common/24.2.2/common-24.2.2.jar
similarity index 73%
rename from common/offline-m2/com/android/tools/common/24.2.1/common-24.2.1.jar
rename to common/offline-m2/com/android/tools/common/24.2.2/common-24.2.2.jar
index edb975c..e35c2c4 100644
--- a/common/offline-m2/com/android/tools/common/24.2.1/common-24.2.1.jar
+++ b/common/offline-m2/com/android/tools/common/24.2.2/common-24.2.2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/common/24.2.1/common-24.2.1.pom b/common/offline-m2/com/android/tools/common/24.2.2/common-24.2.2.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/common/24.2.1/common-24.2.1.pom
rename to common/offline-m2/com/android/tools/common/24.2.2/common-24.2.2.pom
index 7b745df..6f67540 100644
--- a/common/offline-m2/com/android/tools/common/24.2.1/common-24.2.1.pom
+++ b/common/offline-m2/com/android/tools/common/24.2.2/common-24.2.2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>common</artifactId>
-  <version>24.2.1</version>
+  <version>24.2.2</version>
   <name>Android Tools common library</name>
   <description>common library used by other Android tools libraries.</description>
   <url>http://tools.android.com</url>
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>annotations</artifactId>
-      <version>24.2.1</version>
+      <version>24.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/24.2.1/ddmlib-24.2.1-sources.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/24.2.2/ddmlib-24.2.2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/24.2.1/ddmlib-24.2.1-sources.jar
rename to common/offline-m2/com/android/tools/ddms/ddmlib/24.2.2/ddmlib-24.2.2-sources.jar
index 0e047fe..9eeef3e 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/24.2.1/ddmlib-24.2.1-sources.jar
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/24.2.2/ddmlib-24.2.2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/24.2.1/ddmlib-24.2.1.jar b/common/offline-m2/com/android/tools/ddms/ddmlib/24.2.2/ddmlib-24.2.2.jar
similarity index 92%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/24.2.1/ddmlib-24.2.1.jar
rename to common/offline-m2/com/android/tools/ddms/ddmlib/24.2.2/ddmlib-24.2.2.jar
index f5e2d10..88a8443 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/24.2.1/ddmlib-24.2.1.jar
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/24.2.2/ddmlib-24.2.2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/ddms/ddmlib/24.2.1/ddmlib-24.2.1.pom b/common/offline-m2/com/android/tools/ddms/ddmlib/24.2.2/ddmlib-24.2.2.pom
similarity index 96%
rename from common/offline-m2/com/android/tools/ddms/ddmlib/24.2.1/ddmlib-24.2.1.pom
rename to common/offline-m2/com/android/tools/ddms/ddmlib/24.2.2/ddmlib-24.2.2.pom
index a6f9864..14d0d25 100644
--- a/common/offline-m2/com/android/tools/ddms/ddmlib/24.2.1/ddmlib-24.2.1.pom
+++ b/common/offline-m2/com/android/tools/ddms/ddmlib/24.2.2/ddmlib-24.2.2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.ddms</groupId>
   <artifactId>ddmlib</artifactId>
-  <version>24.2.1</version>
+  <version>24.2.2</version>
   <name>Android Tools ddmlib</name>
   <description>Library providing APIs to talk to Android devices</description>
   <url>http://tools.android.com</url>
@@ -33,18 +33,18 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>24.2.2</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>24.2.1</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/24.2.1/dvlib-24.2.1-sources.jar b/common/offline-m2/com/android/tools/dvlib/24.2.2/dvlib-24.2.2-sources.jar
similarity index 98%
rename from common/offline-m2/com/android/tools/dvlib/24.2.1/dvlib-24.2.1-sources.jar
rename to common/offline-m2/com/android/tools/dvlib/24.2.2/dvlib-24.2.2-sources.jar
index 7e29e3d..d7b8482 100644
--- a/common/offline-m2/com/android/tools/dvlib/24.2.1/dvlib-24.2.1-sources.jar
+++ b/common/offline-m2/com/android/tools/dvlib/24.2.2/dvlib-24.2.2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/dvlib/24.2.1/dvlib-24.2.1.jar b/common/offline-m2/com/android/tools/dvlib/24.2.2/dvlib-24.2.2.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/dvlib/24.2.1/dvlib-24.2.1.jar
rename to common/offline-m2/com/android/tools/dvlib/24.2.2/dvlib-24.2.2.jar
index 6499b22..cbbc21c 100644
--- a/common/offline-m2/com/android/tools/dvlib/24.2.1/dvlib-24.2.1.jar
+++ b/common/offline-m2/com/android/tools/dvlib/24.2.2/dvlib-24.2.2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/dvlib/24.2.1/dvlib-24.2.1.pom b/common/offline-m2/com/android/tools/dvlib/24.2.2/dvlib-24.2.2.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/dvlib/24.2.1/dvlib-24.2.1.pom
rename to common/offline-m2/com/android/tools/dvlib/24.2.2/dvlib-24.2.2.pom
index bcc0ac2..ac9988b 100644
--- a/common/offline-m2/com/android/tools/dvlib/24.2.1/dvlib-24.2.1.pom
+++ b/common/offline-m2/com/android/tools/dvlib/24.2.2/dvlib-24.2.2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>dvlib</artifactId>
-  <version>24.2.1</version>
+  <version>24.2.2</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>24.2.2</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>24.2.1</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.1/layoutlib-api-24.2.1-sources.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.2/layoutlib-api-24.2.2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.1/layoutlib-api-24.2.1-sources.jar
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.2/layoutlib-api-24.2.2-sources.jar
index 66d7b8f..5b82570 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.1/layoutlib-api-24.2.1-sources.jar
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.2/layoutlib-api-24.2.2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.1/layoutlib-api-24.2.1.jar b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.2/layoutlib-api-24.2.2.jar
similarity index 88%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.1/layoutlib-api-24.2.1.jar
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.2/layoutlib-api-24.2.2.jar
index a88eb0e..39b8856 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.1/layoutlib-api-24.2.1.jar
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.2/layoutlib-api-24.2.2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.1/layoutlib-api-24.2.1.pom b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.2/layoutlib-api-24.2.2.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.1/layoutlib-api-24.2.1.pom
rename to common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.2/layoutlib-api-24.2.2.pom
index c512f74..c1e8df5 100644
--- a/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.1/layoutlib-api-24.2.1.pom
+++ b/common/offline-m2/com/android/tools/layoutlib/layoutlib-api/24.2.2/layoutlib-api-24.2.2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.layoutlib</groupId>
   <artifactId>layoutlib-api</artifactId>
-  <version>24.2.1</version>
+  <version>24.2.2</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>
@@ -33,16 +33,16 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>common</artifactId>
+      <version>24.2.2</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>24.2.1</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/24.2.1/lint-api-24.2.1-sources.jar b/common/offline-m2/com/android/tools/lint/lint-api/24.2.2/lint-api-24.2.2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/lint/lint-api/24.2.1/lint-api-24.2.1-sources.jar
rename to common/offline-m2/com/android/tools/lint/lint-api/24.2.2/lint-api-24.2.2-sources.jar
index 226b351..68e7408 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/24.2.1/lint-api-24.2.1-sources.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-api/24.2.2/lint-api-24.2.2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/24.2.1/lint-api-24.2.1.jar b/common/offline-m2/com/android/tools/lint/lint-api/24.2.2/lint-api-24.2.2.jar
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-api/24.2.1/lint-api-24.2.1.jar
rename to common/offline-m2/com/android/tools/lint/lint-api/24.2.2/lint-api-24.2.2.jar
index 9098757..a88c442 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/24.2.1/lint-api-24.2.1.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-api/24.2.2/lint-api-24.2.2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-api/24.2.1/lint-api-24.2.1.pom b/common/offline-m2/com/android/tools/lint/lint-api/24.2.2/lint-api-24.2.2.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-api/24.2.1/lint-api-24.2.1.pom
rename to common/offline-m2/com/android/tools/lint/lint-api/24.2.2/lint-api-24.2.2.pom
index 8296c98..f77dd61 100644
--- a/common/offline-m2/com/android/tools/lint/lint-api/24.2.1/lint-api-24.2.1.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-api/24.2.2/lint-api-24.2.2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint-api</artifactId>
-  <version>24.2.1</version>
+  <version>24.2.2</version>
   <name>Android Tools Lint API</name>
   <description>API to build lint checks</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,13 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>sdk-common</artifactId>
-      <version>24.2.1</version>
+      <version>24.2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-model</artifactId>
+      <version>1.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -50,11 +56,5 @@
       <version>0.2.3</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>1.2.1</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/24.2.1/lint-checks-24.2.1-sources.jar b/common/offline-m2/com/android/tools/lint/lint-checks/24.2.2/lint-checks-24.2.2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/lint/lint-checks/24.2.1/lint-checks-24.2.1-sources.jar
rename to common/offline-m2/com/android/tools/lint/lint-checks/24.2.2/lint-checks-24.2.2-sources.jar
index b47b720..fcd00f9 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/24.2.1/lint-checks-24.2.1-sources.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/24.2.2/lint-checks-24.2.2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/24.2.1/lint-checks-24.2.1.jar b/common/offline-m2/com/android/tools/lint/lint-checks/24.2.2/lint-checks-24.2.2.jar
similarity index 93%
rename from common/offline-m2/com/android/tools/lint/lint-checks/24.2.1/lint-checks-24.2.1.jar
rename to common/offline-m2/com/android/tools/lint/lint-checks/24.2.2/lint-checks-24.2.2.jar
index 644728f..21c83a3 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/24.2.1/lint-checks-24.2.1.jar
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/24.2.2/lint-checks-24.2.2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint-checks/24.2.1/lint-checks-24.2.1.pom b/common/offline-m2/com/android/tools/lint/lint-checks/24.2.2/lint-checks-24.2.2.pom
similarity index 94%
rename from common/offline-m2/com/android/tools/lint/lint-checks/24.2.1/lint-checks-24.2.1.pom
rename to common/offline-m2/com/android/tools/lint/lint-checks/24.2.2/lint-checks-24.2.2.pom
index a886399..dd599a6 100644
--- a/common/offline-m2/com/android/tools/lint/lint-checks/24.2.1/lint-checks-24.2.1.pom
+++ b/common/offline-m2/com/android/tools/lint/lint-checks/24.2.2/lint-checks-24.2.2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint-checks</artifactId>
-  <version>24.2.1</version>
+  <version>24.2.2</version>
   <name>Android Lint Checks</name>
   <description>Checks for Android Lint</description>
   <url>http://tools.android.com</url>
@@ -27,21 +27,21 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>24.2.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-analysis</artifactId>
       <version>5.0.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>24.2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>com.android.tools.lint</groupId>
       <artifactId>lint-api</artifactId>
-      <version>24.2.1</version>
+      <version>24.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/common/offline-m2/com/android/tools/lint/lint/24.2.1/lint-24.2.1-sources.jar b/common/offline-m2/com/android/tools/lint/lint/24.2.2/lint-24.2.2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/lint/lint/24.2.1/lint-24.2.1-sources.jar
rename to common/offline-m2/com/android/tools/lint/lint/24.2.2/lint-24.2.2-sources.jar
index dba1d67..159f0af 100644
--- a/common/offline-m2/com/android/tools/lint/lint/24.2.1/lint-24.2.1-sources.jar
+++ b/common/offline-m2/com/android/tools/lint/lint/24.2.2/lint-24.2.2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint/24.2.1/lint-24.2.1.jar b/common/offline-m2/com/android/tools/lint/lint/24.2.2/lint-24.2.2.jar
similarity index 95%
rename from common/offline-m2/com/android/tools/lint/lint/24.2.1/lint-24.2.1.jar
rename to common/offline-m2/com/android/tools/lint/lint/24.2.2/lint-24.2.2.jar
index c00138b..84711cd 100644
--- a/common/offline-m2/com/android/tools/lint/lint/24.2.1/lint-24.2.1.jar
+++ b/common/offline-m2/com/android/tools/lint/lint/24.2.2/lint-24.2.2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/lint/lint/24.2.1/lint-24.2.1.pom b/common/offline-m2/com/android/tools/lint/lint/24.2.2/lint-24.2.2.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/lint/lint/24.2.1/lint-24.2.1.pom
rename to common/offline-m2/com/android/tools/lint/lint/24.2.2/lint-24.2.2.pom
index 304d694..007ac4f 100644
--- a/common/offline-m2/com/android/tools/lint/lint/24.2.1/lint-24.2.1.pom
+++ b/common/offline-m2/com/android/tools/lint/lint/24.2.2/lint-24.2.2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools.lint</groupId>
   <artifactId>lint</artifactId>
-  <version>24.2.1</version>
+  <version>24.2.2</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>
@@ -33,30 +33,30 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>24.2.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
       <version>2.2.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>com.android.tools.lint</groupId>
+      <artifactId>lint-checks</artifactId>
+      <version>24.2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>24.2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.lint</groupId>
-      <artifactId>lint-checks</artifactId>
-      <version>24.2.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>3.3</version>
diff --git a/common/offline-m2/com/android/tools/sdk-common/24.2.1/sdk-common-24.2.1-sources.jar b/common/offline-m2/com/android/tools/sdk-common/24.2.2/sdk-common-24.2.2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/sdk-common/24.2.1/sdk-common-24.2.1-sources.jar
rename to common/offline-m2/com/android/tools/sdk-common/24.2.2/sdk-common-24.2.2-sources.jar
index b715145..e5ad174 100644
--- a/common/offline-m2/com/android/tools/sdk-common/24.2.1/sdk-common-24.2.1-sources.jar
+++ b/common/offline-m2/com/android/tools/sdk-common/24.2.2/sdk-common-24.2.2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdk-common/24.2.1/sdk-common-24.2.1.jar b/common/offline-m2/com/android/tools/sdk-common/24.2.2/sdk-common-24.2.2.jar
similarity index 92%
rename from common/offline-m2/com/android/tools/sdk-common/24.2.1/sdk-common-24.2.1.jar
rename to common/offline-m2/com/android/tools/sdk-common/24.2.2/sdk-common-24.2.2.jar
index 506fd8d..d41301e 100644
--- a/common/offline-m2/com/android/tools/sdk-common/24.2.1/sdk-common-24.2.1.jar
+++ b/common/offline-m2/com/android/tools/sdk-common/24.2.2/sdk-common-24.2.2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdk-common/24.2.1/sdk-common-24.2.1.pom b/common/offline-m2/com/android/tools/sdk-common/24.2.2/sdk-common-24.2.2.pom
similarity index 92%
rename from common/offline-m2/com/android/tools/sdk-common/24.2.1/sdk-common-24.2.1.pom
rename to common/offline-m2/com/android/tools/sdk-common/24.2.2/sdk-common-24.2.2.pom
index e0a0d10..abdbb67 100644
--- a/common/offline-m2/com/android/tools/sdk-common/24.2.1/sdk-common-24.2.1.pom
+++ b/common/offline-m2/com/android/tools/sdk-common/24.2.2/sdk-common-24.2.2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>sdk-common</artifactId>
-  <version>24.2.1</version>
+  <version>24.2.2</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>
@@ -28,17 +28,11 @@
   <dependencies>
     <dependency>
       <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-test-api</artifactId>
-      <version>1.2.1</version>
+      <artifactId>builder-model</artifactId>
+      <version>1.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools</groupId>
-      <artifactId>testutils</artifactId>
-      <version>24.2.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.9.5</version>
@@ -46,8 +40,20 @@
     </dependency>
     <dependency>
       <groupId>com.android.tools</groupId>
+      <artifactId>testutils</artifactId>
+      <version>24.2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools</groupId>
       <artifactId>sdklib</artifactId>
-      <version>24.2.1</version>
+      <version>24.2.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.android.tools.build</groupId>
+      <artifactId>builder-test-api</artifactId>
+      <version>1.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -62,11 +68,5 @@
       <version>2.2.4</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>com.android.tools.build</groupId>
-      <artifactId>builder-model</artifactId>
-      <version>1.2.1</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/common/offline-m2/com/android/tools/sdklib/24.2.1/sdklib-24.2.1-sources.jar b/common/offline-m2/com/android/tools/sdklib/24.2.2/sdklib-24.2.2-sources.jar
similarity index 99%
rename from common/offline-m2/com/android/tools/sdklib/24.2.1/sdklib-24.2.1-sources.jar
rename to common/offline-m2/com/android/tools/sdklib/24.2.2/sdklib-24.2.2-sources.jar
index 92097c1..6b4a5e9 100644
--- a/common/offline-m2/com/android/tools/sdklib/24.2.1/sdklib-24.2.1-sources.jar
+++ b/common/offline-m2/com/android/tools/sdklib/24.2.2/sdklib-24.2.2-sources.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdklib/24.2.1/sdklib-24.2.1.jar b/common/offline-m2/com/android/tools/sdklib/24.2.2/sdklib-24.2.2.jar
similarity index 93%
rename from common/offline-m2/com/android/tools/sdklib/24.2.1/sdklib-24.2.1.jar
rename to common/offline-m2/com/android/tools/sdklib/24.2.2/sdklib-24.2.2.jar
index d4b2d27..4f4eb54 100644
--- a/common/offline-m2/com/android/tools/sdklib/24.2.1/sdklib-24.2.1.jar
+++ b/common/offline-m2/com/android/tools/sdklib/24.2.2/sdklib-24.2.2.jar
Binary files differ
diff --git a/common/offline-m2/com/android/tools/sdklib/24.2.1/sdklib-24.2.1.pom b/common/offline-m2/com/android/tools/sdklib/24.2.2/sdklib-24.2.2.pom
similarity index 95%
rename from common/offline-m2/com/android/tools/sdklib/24.2.1/sdklib-24.2.1.pom
rename to common/offline-m2/com/android/tools/sdklib/24.2.2/sdklib-24.2.2.pom
index 8ec8be5..f95b8a1 100644
--- a/common/offline-m2/com/android/tools/sdklib/24.2.1/sdklib-24.2.1.pom
+++ b/common/offline-m2/com/android/tools/sdklib/24.2.2/sdklib-24.2.2.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.android.tools</groupId>
   <artifactId>sdklib</artifactId>
-  <version>24.2.1</version>
+  <version>24.2.2</version>
   <name>Android Tools sdklib</name>
   <description>A library to parse and download the Android SDK.</description>
   <url>http://tools.android.com</url>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.android.tools</groupId>
       <artifactId>dvlib</artifactId>
-      <version>24.2.1</version>
+      <version>24.2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -51,16 +51,16 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.android.tools.layoutlib</groupId>
-      <artifactId>layoutlib-api</artifactId>
-      <version>24.2.1</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>
+      <groupId>com.android.tools.layoutlib</groupId>
+      <artifactId>layoutlib-api</artifactId>
+      <version>24.2.2</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>