diff --git a/common/m2/Android.bp b/common/m2/Android.bp
index c0900b9..76ee4e1 100644
--- a/common/m2/Android.bp
+++ b/common/m2/Android.bp
@@ -87,6 +87,11 @@
     name: "guava-listenablefuture-prebuilt-jar",
     jars: ["repository/com/google/guava/guava/listenablefuture/1.0/listenablefuture-1.0.jar"],
     sdk_version: "current",
+    min_sdk_version: "29",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
 }
 
 java_import {
@@ -224,6 +229,20 @@
 }
 
 java_import {
+  name: "wire-runtime",
+  jars: [
+    "repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.jar",
+  ],
+}
+
+java_import {
+  name: "okio-prebuilt",
+  jars: [
+    "repository/com/squareup/okio/okio/1.9.0/okio-1.9.0.jar",
+  ],
+}
+
+java_import {
     name: "accessibility-test-framework",
     jars: [
         "repository/com/google/android/apps/common/testing/accessibility/framework/accessibility-test-framework/2.0/accessibility-test-framework-2.0.jar",
@@ -256,6 +275,12 @@
 }
 
 java_import {
+    name: "auto-factory-1.0-beta7",
+    jars: ["repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.jar"],
+    host_supported: true,
+}
+
+java_import {
     name: "commons-codec",
     jars: ["repository/commons-codec/commons-codec/1.10/commons-codec-1.10.jar"],
     host_supported: true,
@@ -280,25 +305,6 @@
 }
 
 java_import_host {
-    name: "car-androidx-room-compiler-tools-common-m2-deps",
-    jars: [
-        "repository/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar",
-        "repository/org/eclipse/tycho/tycho-bundles-external/0.18.1/eclipse/plugins/org.apache.commons.codec_1.4.0.v201209201156.jar",
-        "repository/com/google/auto/auto-common/0.9/auto-common-0.9.jar",
-        "repository/com/squareup/javapoet/1.8.0/javapoet-1.8.0.jar",
-        // TODO: remove this one?
-        "repository/org/jetbrains/annotations/13.0/annotations-13.0.jar",
-        "repository/me/eugeniomarletti/kotlin-metadata/1.2.1/kotlin-metadata-1.2.1.jar",
-        "repository/org/xerial/sqlite-jdbc/3.20.1/sqlite-jdbc-3.20.1.jar",
-    ],
-    // Exclude signature files that cause the combined jar to be rejected.
-    exclude_files: [
-        "META-INF/ECLIPSE_.SF",
-        "META-INF/ECLIPSE_.RSA",
-    ],
-}
-
-java_import_host {
     name: "javax-annotation-api-prebuilt-host-jar",
     jars: ["repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar"],
 }
@@ -316,6 +322,12 @@
 }
 
 java_import {
+    name: "flogger-0.5.1",
+    jars: ["repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.jar"],
+    host_supported: true,
+}
+
+java_import {
     name: "symbol-processing-api",
     jars: ["repository/com/google/devtools/ksp/symbol-processing-api/1.4.10-dev-experimental-20201110/symbol-processing-api-1.4.10-dev-experimental-20201110.jar"],
     host_supported: true,
diff --git a/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.jar b/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.jar
new file mode 100644
index 0000000..c1bddf3
--- /dev/null
+++ b/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.jar
Binary files differ
diff --git a/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.jar.md5 b/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.jar.md5
new file mode 100644
index 0000000..bdad9e8
--- /dev/null
+++ b/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.jar.md5
@@ -0,0 +1 @@
+282256d56890cf570ebb1818895f81f5
\ No newline at end of file
diff --git a/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.jar.sha1 b/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.jar.sha1
new file mode 100644
index 0000000..63d3e79
--- /dev/null
+++ b/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.jar.sha1
@@ -0,0 +1 @@
+a12eedf93a5d3be9ca1986fddd6beb3fbc117f4b
\ No newline at end of file
diff --git a/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.pom b/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.pom
new file mode 100644
index 0000000..4b3beab
--- /dev/null
+++ b/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.auto.factory</groupId>
+  <artifactId>auto-factory</artifactId>
+  <version>1.0-beta7</version>
+  <description>POM was created from install:install-file</description>
+</project>
diff --git a/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.pom.md5 b/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.pom.md5
new file mode 100644
index 0000000..646459c
--- /dev/null
+++ b/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.pom.md5
@@ -0,0 +1 @@
+e31d0868d9ce7e31022864bde639b376
\ No newline at end of file
diff --git a/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.pom.sha1 b/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.pom.sha1
new file mode 100644
index 0000000..f3068ce
--- /dev/null
+++ b/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/auto-factory-1.0-beta7.pom.sha1
@@ -0,0 +1 @@
+f30756213ce3468c4f2be4b626f99ad7dbe77d0b
\ No newline at end of file
diff --git a/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/readme.txt b/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/readme.txt
new file mode 100644
index 0000000..94c9b95
--- /dev/null
+++ b/common/m2/repository/com/google/auto/factory/auto-factory/1.0-beta7/readme.txt
@@ -0,0 +1,16 @@
+This jar was produced by the following command:
+
+mvn org.apache.maven.plugins:maven-install-plugin:2.5.1:install-file \
+        -Dfile=$OUT/auto-factory-1.0-beta7.jar \
+        -DgroupId=com.google.auto.factory \
+        -DartifactId=auto-factory \
+        -Dversion=1.0-beta7 \
+        -Dpackaging=jar \
+        -DgeneratePom=true \
+        -DlocalRepositoryPath=repository \
+        -DcreateChecksum=true
+
+
+The Dfile jar was obtained from:
+
+https://search.maven.org/artifact/com.google.auto.factory/auto-factory/1.0-beta7/jar
diff --git a/common/m2/repository/com/google/auto/factory/auto-factory/maven-metadata-local.xml b/common/m2/repository/com/google/auto/factory/auto-factory/maven-metadata-local.xml
new file mode 100644
index 0000000..483208a
--- /dev/null
+++ b/common/m2/repository/com/google/auto/factory/auto-factory/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>com.google.auto.factory</groupId>
+  <artifactId>auto-factory</artifactId>
+  <versioning>
+    <release>1.0-beta7</release>
+    <versions>
+      <version>1.0-beta7</version>
+    </versions>
+    <lastUpdated>20200507125757</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/common/m2/repository/com/google/auto/factory/auto-factory/maven-metadata-local.xml.md5 b/common/m2/repository/com/google/auto/factory/auto-factory/maven-metadata-local.xml.md5
new file mode 100644
index 0000000..dcbfcc6
--- /dev/null
+++ b/common/m2/repository/com/google/auto/factory/auto-factory/maven-metadata-local.xml.md5
@@ -0,0 +1 @@
+2a8eac6a0edc3a4d6276d5bb755aa64a
\ No newline at end of file
diff --git a/common/m2/repository/com/google/auto/factory/auto-factory/maven-metadata-local.xml.sha1 b/common/m2/repository/com/google/auto/factory/auto-factory/maven-metadata-local.xml.sha1
new file mode 100644
index 0000000..2f10ed8
--- /dev/null
+++ b/common/m2/repository/com/google/auto/factory/auto-factory/maven-metadata-local.xml.sha1
@@ -0,0 +1 @@
+4d1182171d40b2dd21291f3b991563f0ee2496d7
\ No newline at end of file
diff --git a/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.jar b/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.jar
new file mode 100644
index 0000000..fcc32e6
--- /dev/null
+++ b/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.jar
Binary files differ
diff --git a/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.jar.md5 b/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.jar.md5
new file mode 100644
index 0000000..6f432c3
--- /dev/null
+++ b/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.jar.md5
@@ -0,0 +1 @@
+d414393f993522c3512597a2cad8ed9e
\ No newline at end of file
diff --git a/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.jar.sha1 b/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.jar.sha1
new file mode 100644
index 0000000..155c8d8
--- /dev/null
+++ b/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.jar.sha1
@@ -0,0 +1 @@
+71d1e2cef9cc604800825583df56b8ef5c053f14
\ No newline at end of file
diff --git a/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.pom b/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.pom
new file mode 100644
index 0000000..f3f7c7e
--- /dev/null
+++ b/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.flogger</groupId>
+  <artifactId>flogger</artifactId>
+  <version>0.5.1</version>
+  <description>POM was created from install:install-file</description>
+</project>
diff --git a/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.pom.md5 b/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.pom.md5
new file mode 100644
index 0000000..083d09f
--- /dev/null
+++ b/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.pom.md5
@@ -0,0 +1 @@
+6c056988d731cf8106d4de04c8826c0e
\ No newline at end of file
diff --git a/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.pom.sha1 b/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.pom.sha1
new file mode 100644
index 0000000..8d7c9b4
--- /dev/null
+++ b/common/m2/repository/com/google/flogger/flogger/0.5.1/flogger-0.5.1.pom.sha1
@@ -0,0 +1 @@
+6bf7f0b3541ef322fbe9261de8b95e352c95dc42
\ No newline at end of file
diff --git a/common/m2/repository/com/google/flogger/flogger/0.5.1/readme.txt b/common/m2/repository/com/google/flogger/flogger/0.5.1/readme.txt
new file mode 100644
index 0000000..0863aab
--- /dev/null
+++ b/common/m2/repository/com/google/flogger/flogger/0.5.1/readme.txt
@@ -0,0 +1,16 @@
+This jar was produced by the following command:
+
+mvn org.apache.maven.plugins:maven-install-plugin:2.5.1:install-file \
+        -Dfile=$OUT/flogger-0.5.1.jar \
+        -DgroupId=com.google.flogger \
+        -DartifactId=flogger \
+        -Dversion=0.5.1 \
+        -Dpackaging=jar \
+        -DgeneratePom=true \
+        -DlocalRepositoryPath=repository \
+        -DcreateChecksum=true
+
+
+The Dfile jar was obtained from:
+
+https://search.maven.org/artifact/com.google.flogger/flogger/0.5.1/jar
diff --git a/common/m2/repository/com/google/flogger/flogger/maven-metadata-local.xml b/common/m2/repository/com/google/flogger/flogger/maven-metadata-local.xml
new file mode 100644
index 0000000..bd7c758
--- /dev/null
+++ b/common/m2/repository/com/google/flogger/flogger/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>com.google.flogger</groupId>
+  <artifactId>flogger</artifactId>
+  <versioning>
+    <release>0.5.1</release>
+    <versions>
+      <version>0.5.1</version>
+    </versions>
+    <lastUpdated>20200507122909</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/common/m2/repository/com/google/flogger/flogger/maven-metadata-local.xml.md5 b/common/m2/repository/com/google/flogger/flogger/maven-metadata-local.xml.md5
new file mode 100644
index 0000000..075ba23
--- /dev/null
+++ b/common/m2/repository/com/google/flogger/flogger/maven-metadata-local.xml.md5
@@ -0,0 +1 @@
+e58f5adbdc8cbd3d625a710c3313601b
\ No newline at end of file
diff --git a/common/m2/repository/com/google/flogger/flogger/maven-metadata-local.xml.sha1 b/common/m2/repository/com/google/flogger/flogger/maven-metadata-local.xml.sha1
new file mode 100644
index 0000000..a16793b
--- /dev/null
+++ b/common/m2/repository/com/google/flogger/flogger/maven-metadata-local.xml.sha1
@@ -0,0 +1 @@
+53c816f07c04797a5e8e39ec5526c35eef618d81
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.24/truth-0.24-sources.jar b/common/m2/repository/com/google/truth/truth/0.24/truth-0.24-sources.jar
deleted file mode 100644
index 8746400..0000000
--- a/common/m2/repository/com/google/truth/truth/0.24/truth-0.24-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/com/google/truth/truth/0.24/truth-0.24.jar b/common/m2/repository/com/google/truth/truth/0.24/truth-0.24.jar
deleted file mode 100644
index 2036510..0000000
--- a/common/m2/repository/com/google/truth/truth/0.24/truth-0.24.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/com/google/truth/truth/0.24/truth-0.24.pom b/common/m2/repository/com/google/truth/truth/0.24/truth-0.24.pom
deleted file mode 100644
index f244f4d..0000000
--- a/common/m2/repository/com/google/truth/truth/0.24/truth-0.24.pom
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.google.truth</groupId>
-    <artifactId>truth-parent</artifactId>
-    <version>0.24</version>
-  </parent>
-  <artifactId>truth</artifactId>
-  <properties>
-    <javadoc.param></javadoc.param>
-    <gwt.version>2.6.1</gwt.version>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>17.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>2.0.1</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.10</version>
-    </dependency>
-    <!-- Required only to build the -gwt sub-artifact. -->
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${gwt.version}</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.google.auto.value</groupId>
-      <artifactId>auto-value</artifactId>
-      <version>1.0-rc1</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-gwt</artifactId>
-      <version>17.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.testing.compile</groupId>
-      <artifactId>compile-testing</artifactId>
-      <version>0.6</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-          <exclude>**/*.gwt.xml</exclude>          
-        </excludes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource><directory>src/test/java</directory></testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-          <excludes>
-            <exclude>**/super/**/*.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-docs</id>
-            <phase>post-integration-test</phase>
-            <goals><goal>jar</goal></goals>
-            <configuration>
-                <additionalparam>${javadoc.param}</additionalparam>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>post-integration-test</phase>
-            <goals><goal>jar-no-fork</goal></goals>
-            <configuration>
-              <excludes>
-                <exclude>**/super/**</exclude>
-                <exclude>**/*.gwt.xml</exclude>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <!-- TODO(cgruber): Replace this with Gwt annotation processing plugin. -->
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-gwt-sources</id>
-            <phase>post-integration-test</phase>
-            <goals><goal>jar</goal></goals>
-            <configuration>
-              <classifier>gwt</classifier>
-              <classesDirectory>src/main/java</classesDirectory>
-              <includes>
-                <include>**/*.java</include>
-                <include>**/*.gwt.xml</include>
-              </includes>
-              <excludes>
-                <exclude>org/truth0/codegen/**</exclude>
-                <exclude>org/truth0/subjects/ClassSubject.java</exclude>
-                <exclude>org/truth0/util/ReflectionUtil.java</exclude>
-                <exclude>org/truth0/IteratingVerb.java</exclude>
-                <exclude>org/truth0/Expect.java</exclude>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/*GwtTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <version>${gwt.version}</version>
-        <executions>
-          <execution>
-            <id>gwt-test</id>
-            <goals><goal>test</goal></goals>
-            <configuration>
-              <mode>htmlunit</mode>
-              <productionMode>true</productionMode>
-              <userAgents>gecko1_8</userAgents>
-              <includes>**/*GwtTest.java</includes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.5.2</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.5.1</version>
-        <configuration>
-          <formats>
-            <format>html</format>
-            <format>xml</format>
-          </formats>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.9.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.7.1</version>
-        <configuration>
-          <linkXref>true</linkXref>
-          <sourceEncoding>utf-8</sourceEncoding>
-          <targetJdk>1.6</targetJdk>
-        </configuration>        
-      </plugin>
-    </plugins>
-  </reporting>
-  <profiles>
-  <profile>
-    <id>java8</id>
-    <activation>
-      <jdk>[1.8,)</jdk>
-    </activation>
-    <properties>
-      <javadoc.param>-Xdoclint:none</javadoc.param>
-    </properties>
-  </profile>
-</profiles>
-</project>
diff --git a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26-sources.jar b/common/m2/repository/com/google/truth/truth/0.26/truth-0.26-sources.jar
deleted file mode 100644
index 71c6894..0000000
--- a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26-sources.jar.md5 b/common/m2/repository/com/google/truth/truth/0.26/truth-0.26-sources.jar.md5
deleted file mode 100644
index e69de29..0000000
--- a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26-sources.jar.md5
+++ /dev/null
diff --git a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26-sources.jar.sha1 b/common/m2/repository/com/google/truth/truth/0.26/truth-0.26-sources.jar.sha1
deleted file mode 100644
index 2c47846..0000000
--- a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e34eed5d971880a9675085385a840f7cf2f6a57a
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.jar b/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.jar
deleted file mode 100644
index 196a067..0000000
--- a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.jar.md5 b/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.jar.md5
deleted file mode 100644
index e69de29..0000000
--- a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.jar.md5
+++ /dev/null
diff --git a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.jar.sha1 b/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.jar.sha1
deleted file mode 100644
index dda1df3..0000000
--- a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b5802815625d82f39c33219299771f3d64301b06
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.pom b/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.pom
deleted file mode 100644
index 210ad0b..0000000
--- a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.pom
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.google.truth</groupId>
-    <artifactId>truth-parent</artifactId>
-    <version>0.26</version>
-  </parent>
-  <artifactId>truth</artifactId>
-  <properties>
-    <javadoc.param></javadoc.param>
-    <gwt.version>2.6.1</gwt.version>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>18.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>2.0.1</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.10</version>
-    </dependency>
-    <!-- Required only to build the -gwt sub-artifact. -->
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${gwt.version}</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.google.auto.value</groupId>
-      <artifactId>auto-value</artifactId>
-      <version>1.0-rc1</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-gwt</artifactId>
-      <version>18.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-testlib</artifactId>
-      <version>18.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.testing.compile</groupId>
-      <artifactId>compile-testing</artifactId>
-      <version>0.6</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-          <exclude>**/*.gwt.xml</exclude>          
-        </excludes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource><directory>src/test/java</directory></testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-          <excludes>
-            <exclude>**/super/**/*.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-docs</id>
-            <phase>post-integration-test</phase>
-            <goals><goal>jar</goal></goals>
-            <configuration>
-                <additionalparam>${javadoc.param}</additionalparam>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>post-integration-test</phase>
-            <goals><goal>jar-no-fork</goal></goals>
-            <configuration>
-              <excludes>
-                <exclude>**/super/**</exclude>
-                <exclude>**/*.gwt.xml</exclude>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <!-- TODO(cgruber): Replace this with Gwt annotation processing plugin. -->
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-gwt-sources</id>
-            <phase>post-integration-test</phase>
-            <goals><goal>jar</goal></goals>
-            <configuration>
-              <classifier>gwt</classifier>
-              <classesDirectory>src/main/java</classesDirectory>
-              <includes>
-                <include>**/*.java</include>
-                <include>**/*.gwt.xml</include>
-              </includes>
-              <excludes>
-                <exclude>com/google/common/truth/ClassSubject.java</exclude>
-                <exclude>com/google/common/truth/Expect.java</exclude>
-                <exclude>com/google/common/truth/IteratingVerb.java</exclude>
-                <exclude>com/google/common/truth/ReflectionUtil.java</exclude>
-                <exclude>com/google/common/truth/codegen/**</exclude>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/*GwtTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <version>${gwt.version}</version>
-        <executions>
-          <execution>
-            <id>gwt-test</id>
-            <goals><goal>test</goal></goals>
-            <configuration>
-              <mode>htmlunit</mode>
-              <productionMode>true</productionMode>
-              <sourceLevel>1.7</sourceLevel>
-              <userAgents>gecko1_8</userAgents>
-              <includes>**/*GwtTest.java</includes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.5.2</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.5.1</version>
-        <configuration>
-          <formats>
-            <format>html</format>
-            <format>xml</format>
-          </formats>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.9.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.7.1</version>
-        <configuration>
-          <linkXref>true</linkXref>
-          <sourceEncoding>utf-8</sourceEncoding>
-          <targetJdk>1.6</targetJdk>
-        </configuration>        
-      </plugin>
-    </plugins>
-  </reporting>
-  <profiles>
-  <profile>
-    <id>java8</id>
-    <activation>
-      <jdk>[1.8,)</jdk>
-    </activation>
-    <properties>
-      <javadoc.param>-Xdoclint:none</javadoc.param>
-    </properties>
-  </profile>
-</profiles>
-</project>
diff --git a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.pom.md5 b/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.pom.md5
deleted file mode 100644
index e69de29..0000000
--- a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.pom.md5
+++ /dev/null
diff --git a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.pom.sha1 b/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.pom.sha1
deleted file mode 100644
index 3eb9361..0000000
--- a/common/m2/repository/com/google/truth/truth/0.26/truth-0.26.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-326ee8546589be79ed48078b4b2fccd03529ddcb
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.28/NOTICE b/common/m2/repository/com/google/truth/truth/0.28/NOTICE
deleted file mode 100644
index d645695..0000000
--- a/common/m2/repository/com/google/truth/truth/0.28/NOTICE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28-sources.jar b/common/m2/repository/com/google/truth/truth/0.28/truth-0.28-sources.jar
deleted file mode 100644
index 51bf20e..0000000
--- a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28-sources.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28-sources.jar.md5 b/common/m2/repository/com/google/truth/truth/0.28/truth-0.28-sources.jar.md5
deleted file mode 100644
index 2e4e290..0000000
--- a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28-sources.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-0a44e67f1af4324a8b311912e556b2d0
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28-sources.jar.sha1 b/common/m2/repository/com/google/truth/truth/0.28/truth-0.28-sources.jar.sha1
deleted file mode 100644
index 4b70437..0000000
--- a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cd343f2cdcf9f99b79c8e38dc9f40b3c54c7c583
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.jar b/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.jar
deleted file mode 100644
index 8b79786..0000000
--- a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.jar.md5 b/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.jar.md5
deleted file mode 100644
index b2368bb..0000000
--- a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-a85ddfcf767e8ca226dcdbd4a160e237
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.jar.sha1 b/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.jar.sha1
deleted file mode 100644
index 6150d0e..0000000
--- a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0a388c7877c845ff4b8e19689dda5ac9d34622c4
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.pom b/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.pom
deleted file mode 100644
index 6b80433..0000000
--- a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.pom
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.google.truth</groupId>
-    <artifactId>truth-parent</artifactId>
-    <version>0.28</version>
-  </parent>
-  <artifactId>truth</artifactId>
-  <properties>
-    <gwt.version>2.6.1</gwt.version>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>18.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>2.0.1</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.10</version>
-    </dependency>
-    <!-- Required only to build the -gwt sub-artifact. -->
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${gwt.version}</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.google.auto.value</groupId>
-      <artifactId>auto-value</artifactId>
-      <version>1.0</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-gwt</artifactId>
-      <version>18.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-testlib</artifactId>
-      <version>18.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.testing.compile</groupId>
-      <artifactId>compile-testing</artifactId>
-      <version>0.7</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-          <exclude>**/*.gwt.xml</exclude>          
-        </excludes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource><directory>src/test/java</directory></testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-          <excludes>
-            <exclude>**/super/**/*.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/super/**</exclude>
-            <exclude>**/*.gwt.xml</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <!-- TODO(cgruber): Replace this with Gwt annotation processing plugin. -->
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-gwt-sources</id>
-            <phase>post-integration-test</phase>
-            <goals><goal>jar</goal></goals>
-            <configuration>
-              <classifier>gwt</classifier>
-              <classesDirectory>src/main/java</classesDirectory>
-              <includes>
-                <include>**/*.java</include>
-                <include>**/*.gwt.xml</include>
-              </includes>
-              <excludes>
-                <exclude>com/google/common/truth/ClassSubject.java</exclude>
-                <exclude>com/google/common/truth/Expect.java</exclude>
-                <exclude>com/google/common/truth/IteratingVerb.java</exclude>
-                <exclude>com/google/common/truth/ReflectionUtil.java</exclude>
-                <exclude>com/google/common/truth/codegen/**</exclude>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/*GwtTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <version>${gwt.version}</version>
-        <executions>
-          <execution>
-            <id>gwt-test</id>
-            <goals><goal>test</goal></goals>
-            <configuration>
-              <mode>htmlunit</mode>
-              <productionMode>true</productionMode>
-              <sourceLevel>1.7</sourceLevel>
-              <userAgents>gecko1_8</userAgents>
-              <includes>**/*GwtTest.java</includes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.5.2</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.5.1</version>
-        <configuration>
-          <formats>
-            <format>html</format>
-            <format>xml</format>
-          </formats>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.9.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.7.1</version>
-        <configuration>
-          <linkXref>true</linkXref>
-          <sourceEncoding>utf-8</sourceEncoding>
-          <targetJdk>1.6</targetJdk>
-        </configuration>        
-      </plugin>
-    </plugins>
-  </reporting>
-  <profiles>
-    <profile>
-      <id>java8</id>
-      <activation>
-        <jdk>[1.8,)</jdk>
-      </activation>
-      <properties>
-        <javadoc.param>-Xdoclint:none</javadoc.param>
-      </properties>
-    </profile>
-  </profiles>
-</project>
diff --git a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.pom.md5 b/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.pom.md5
deleted file mode 100644
index ec94cbd..0000000
--- a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-90f3b7612ede789105364d1f1b0bfc8b
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.pom.sha1 b/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.pom.sha1
deleted file mode 100644
index d02fb51..0000000
--- a/common/m2/repository/com/google/truth/truth/0.28/truth-0.28.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8a03139a76bd3899d572b79af4954b8e0ccc982a
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.31/_remote.repositories b/common/m2/repository/com/google/truth/truth/0.31/_remote.repositories
deleted file mode 100644
index 0c85e5c..0000000
--- a/common/m2/repository/com/google/truth/truth/0.31/_remote.repositories
+++ /dev/null
@@ -1,4 +0,0 @@
-#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
-#Mon Jul 17 17:40:48 PDT 2017
-truth-0.31.jar>central=
-truth-0.31.pom>central=
diff --git a/common/m2/repository/com/google/truth/truth/0.31/truth-0.31.jar b/common/m2/repository/com/google/truth/truth/0.31/truth-0.31.jar
deleted file mode 100644
index 2b98ebc..0000000
--- a/common/m2/repository/com/google/truth/truth/0.31/truth-0.31.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/com/google/truth/truth/0.31/truth-0.31.jar.sha1 b/common/m2/repository/com/google/truth/truth/0.31/truth-0.31.jar.sha1
deleted file mode 100644
index 996bbf6..0000000
--- a/common/m2/repository/com/google/truth/truth/0.31/truth-0.31.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1a926b0cb2879fd32efbb3716ee8bab040f4218b
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.31/truth-0.31.pom b/common/m2/repository/com/google/truth/truth/0.31/truth-0.31.pom
deleted file mode 100644
index 1be0b47..0000000
--- a/common/m2/repository/com/google/truth/truth/0.31/truth-0.31.pom
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.google.truth</groupId>
-    <artifactId>truth-parent</artifactId>
-    <version>0.31</version>
-  </parent>
-  <artifactId>truth</artifactId>
-  <properties>
-    <guava.version>20.0</guava.version>
-    <gwt.version>2.8.0</gwt.version>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>${guava.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>3.0.1</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.10</version>
-    </dependency>
-    <!-- Required only to build the -gwt sub-artifact. -->
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${gwt.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.auto.value</groupId>
-      <artifactId>auto-value</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-gwt</artifactId>
-      <version>${guava.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-testlib</artifactId>
-      <version>${guava.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.testing.compile</groupId>
-      <artifactId>compile-testing</artifactId>
-      <version>0.8</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.errorprone</groupId>
-      <artifactId>error_prone_annotations</artifactId>
-      <version>2.0.12</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-          <exclude>**/*.gwt.xml</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource><directory>src/test/java</directory></testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-          <excludes>
-            <exclude>**/super/**/*.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/super/**</exclude>
-            <exclude>**/*.gwt.xml</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <!-- TODO(cgruber): Replace this with Gwt annotation processing plugin. -->
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-gwt-sources</id>
-            <phase>post-integration-test</phase>
-            <goals><goal>jar</goal></goals>
-            <configuration>
-              <classifier>gwt</classifier>
-              <classesDirectory>src/main/java</classesDirectory>
-              <includes>
-                <include>**/*.java</include>
-                <include>**/*.gwt.xml</include>
-              </includes>
-              <excludes>
-                <exclude>com/google/common/truth/ClassSubject.java</exclude>
-                <exclude>com/google/common/truth/Expect.java</exclude>
-                <exclude>com/google/common/truth/IteratingVerb.java</exclude>
-                <exclude>com/google/common/truth/ReflectionUtil.java</exclude>
-                <exclude>com/google/common/truth/codegen/**</exclude>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/*GwtTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <version>${gwt.version}</version>
-        <executions>
-          <execution>
-            <id>gwt-test</id>
-            <goals><goal>test</goal></goals>
-            <configuration>
-              <mode>htmlunit</mode>
-              <productionMode>true</productionMode>
-              <sourceLevel>auto</sourceLevel>
-              <userAgents>gecko1_8</userAgents>
-              <includes>**/*GwtTest.java</includes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.5.2</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.5.1</version>
-        <configuration>
-          <formats>
-            <format>html</format>
-            <format>xml</format>
-          </formats>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.9.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.7.1</version>
-        <configuration>
-          <linkXref>true</linkXref>
-          <sourceEncoding>utf-8</sourceEncoding>
-          <targetJdk>1.6</targetJdk>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-  <profiles>
-    <profile>
-      <id>java8</id>
-      <activation>
-        <jdk>[1.8,)</jdk>
-      </activation>
-      <properties>
-        <javadoc.param>-Xdoclint:none</javadoc.param>
-      </properties>
-    </profile>
-  </profiles>
-</project>
diff --git a/common/m2/repository/com/google/truth/truth/0.31/truth-0.31.pom.sha1 b/common/m2/repository/com/google/truth/truth/0.31/truth-0.31.pom.sha1
deleted file mode 100644
index fe8f19a..0000000
--- a/common/m2/repository/com/google/truth/truth/0.31/truth-0.31.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c31e82873cfac152a37152ae28baeb7fa3e96ec2
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.34/truth-0.34.jar b/common/m2/repository/com/google/truth/truth/0.34/truth-0.34.jar
deleted file mode 100644
index 499b9ca..0000000
--- a/common/m2/repository/com/google/truth/truth/0.34/truth-0.34.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/com/google/truth/truth/0.34/truth-0.34.jar.sha1 b/common/m2/repository/com/google/truth/truth/0.34/truth-0.34.jar.sha1
deleted file mode 100644
index 174fb8d..0000000
--- a/common/m2/repository/com/google/truth/truth/0.34/truth-0.34.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-73379200e907386d27eb10da60c5c2ed339f2bec
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.34/truth-0.34.pom b/common/m2/repository/com/google/truth/truth/0.34/truth-0.34.pom
deleted file mode 100644
index fe3be00..0000000
--- a/common/m2/repository/com/google/truth/truth/0.34/truth-0.34.pom
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.google.truth</groupId>
-    <artifactId>truth-parent</artifactId>
-    <version>0.34</version>
-  </parent>
-  <artifactId>truth</artifactId>
-  <properties>
-    <guava.version>20.0</guava.version>
-    <gwt.version>2.8.0</gwt.version>
-    <junit.version>4.12</junit.version>
-    <jsr305.version>3.0.1</jsr305.version>
-    <auto-value.version>1.4.1</auto-value.version>
-    <compile-testing.version>0.10</compile-testing.version>
-    <error-prone.annotations.version>2.0.18</error-prone.annotations.version>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>${guava.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>${jsr305.version}</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-    </dependency>
-    <!-- Required only to build the -gwt sub-artifact. -->
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${gwt.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.auto.value</groupId>
-      <artifactId>auto-value</artifactId>
-      <version>${auto-value.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-gwt</artifactId>
-      <version>${guava.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-testlib</artifactId>
-      <version>${guava.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.testing.compile</groupId>
-      <artifactId>compile-testing</artifactId>
-      <version>${compile-testing.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.errorprone</groupId>
-      <artifactId>error_prone_annotations</artifactId>
-      <version>${error-prone.annotations.version}</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-          <exclude>**/*.gwt.xml</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource><directory>src/test/java</directory></testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-          <excludes>
-            <exclude>**/super/**/*.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/super/**</exclude>
-            <exclude>**/*.gwt.xml</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <!-- TODO(cgruber): Replace this with Gwt annotation processing plugin. -->
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-gwt-sources</id>
-            <phase>post-integration-test</phase>
-            <goals><goal>jar</goal></goals>
-            <configuration>
-              <classifier>gwt</classifier>
-              <classesDirectory>src/main/java</classesDirectory>
-              <includes>
-                <include>**/*.java</include>
-                <include>**/*.gwt.xml</include>
-              </includes>
-              <excludes>
-                <exclude>com/google/common/truth/ClassSubject.java</exclude>
-                <exclude>com/google/common/truth/Expect.java</exclude>
-                <exclude>com/google/common/truth/IteratingVerb.java</exclude>
-                <exclude>com/google/common/truth/ReflectionUtil.java</exclude>
-                <exclude>com/google/common/truth/codegen/**</exclude>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/*GwtTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <version>${gwt.version}</version>
-        <executions>
-          <execution>
-            <id>gwt-test</id>
-            <goals><goal>test</goal></goals>
-            <configuration>
-              <mode>htmlunit</mode>
-              <productionMode>true</productionMode>
-              <sourceLevel>auto</sourceLevel>
-              <userAgents>gecko1_8</userAgents>
-              <includes>**/*GwtTest.java</includes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.5.2</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.5.1</version>
-        <configuration>
-          <formats>
-            <format>html</format>
-            <format>xml</format>
-          </formats>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.9.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.7.1</version>
-        <configuration>
-          <linkXref>true</linkXref>
-          <sourceEncoding>utf-8</sourceEncoding>
-          <targetJdk>1.6</targetJdk>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-  <profiles>
-    <profile>
-      <id>java8</id>
-      <activation>
-        <jdk>[1.8,)</jdk>
-      </activation>
-      <properties>
-        <javadoc.param>-Xdoclint:none</javadoc.param>
-      </properties>
-    </profile>
-  </profiles>
-</project>
diff --git a/common/m2/repository/com/google/truth/truth/0.34/truth-0.34.pom.sha1 b/common/m2/repository/com/google/truth/truth/0.34/truth-0.34.pom.sha1
deleted file mode 100644
index 1903298..0000000
--- a/common/m2/repository/com/google/truth/truth/0.34/truth-0.34.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8779376039385b0aeeac45fafdf6aa27410a883d
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.36/truth-0.36.jar b/common/m2/repository/com/google/truth/truth/0.36/truth-0.36.jar
deleted file mode 100644
index 8174e4a..0000000
--- a/common/m2/repository/com/google/truth/truth/0.36/truth-0.36.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/com/google/truth/truth/0.36/truth-0.36.jar.sha1 b/common/m2/repository/com/google/truth/truth/0.36/truth-0.36.jar.sha1
deleted file mode 100644
index 272693a..0000000
--- a/common/m2/repository/com/google/truth/truth/0.36/truth-0.36.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7485219d2c1d341097a19382c02bde07e69ff5d2
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.36/truth-0.36.pom b/common/m2/repository/com/google/truth/truth/0.36/truth-0.36.pom
deleted file mode 100644
index 4df6c03..0000000
--- a/common/m2/repository/com/google/truth/truth/0.36/truth-0.36.pom
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.google.truth</groupId>
-    <artifactId>truth-parent</artifactId>
-    <version>0.36</version>
-  </parent>
-  <artifactId>truth</artifactId>
-  <name>Truth Core</name>
-  <properties>
-    <guava.version>22.0-android</guava.version>
-    <guava-gwt.version>22.0</guava-gwt.version>
-    <gwt.version>2.8.0</gwt.version>
-    <junit.version>4.12</junit.version>
-    <jsr305.version>3.0.2</jsr305.version>
-    <auto-value.version>1.4.1</auto-value.version>
-    <compile-testing.version>0.12</compile-testing.version>
-    <error-prone.annotations.version>2.0.19</error-prone.annotations.version>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>${guava.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>${jsr305.version}</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-    </dependency>
-    <!-- Required only to build the -gwt sub-artifact. -->
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${gwt.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.auto.value</groupId>
-      <artifactId>auto-value</artifactId>
-      <version>${auto-value.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-gwt</artifactId>
-      <version>${guava-gwt.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-testlib</artifactId>
-      <version>${guava.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.testing.compile</groupId>
-      <artifactId>compile-testing</artifactId>
-      <version>${compile-testing.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.errorprone</groupId>
-      <artifactId>error_prone_annotations</artifactId>
-      <version>${error-prone.annotations.version}</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-          <exclude>**/*.gwt.xml</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource><directory>src/test/java</directory></testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-          <excludes>
-            <exclude>**/super/**/*.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/super/**</exclude>
-            <exclude>**/*.gwt.xml</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <!-- TODO(cgruber): Replace this with Gwt annotation processing plugin. -->
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-gwt-sources</id>
-            <phase>post-integration-test</phase>
-            <goals><goal>jar</goal></goals>
-            <configuration>
-              <classifier>gwt</classifier>
-              <classesDirectory>src/main/java</classesDirectory>
-              <includes>
-                <include>**/*.java</include>
-                <include>**/*.gwt.xml</include>
-              </includes>
-              <excludes>
-                <exclude>com/google/common/truth/ClassSubject.java</exclude>
-                <exclude>com/google/common/truth/Expect.java</exclude>
-                <exclude>com/google/common/truth/IteratingVerb.java</exclude>
-                <exclude>com/google/common/truth/ReflectionUtil.java</exclude>
-                <exclude>com/google/common/truth/codegen/**</exclude>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/*GwtTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <version>${gwt.version}</version>
-        <executions>
-          <execution>
-            <id>gwt-test</id>
-            <goals><goal>test</goal></goals>
-            <configuration>
-              <mode>htmlunit</mode>
-              <productionMode>true</productionMode>
-              <sourceLevel>auto</sourceLevel>
-              <userAgents>gecko1_8</userAgents>
-              <includes>**/*GwtTest.java</includes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.5.2</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.5.1</version>
-        <configuration>
-          <formats>
-            <format>html</format>
-            <format>xml</format>
-          </formats>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.9.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.7.1</version>
-        <configuration>
-          <linkXref>true</linkXref>
-          <sourceEncoding>utf-8</sourceEncoding>
-          <targetJdk>1.6</targetJdk>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-  <profiles>
-    <profile>
-      <id>java8</id>
-      <activation>
-        <jdk>[1.8,)</jdk>
-      </activation>
-      <properties>
-        <javadoc.param>-Xdoclint:none</javadoc.param>
-      </properties>
-    </profile>
-  </profiles>
-</project>
diff --git a/common/m2/repository/com/google/truth/truth/0.36/truth-0.36.pom.sha1 b/common/m2/repository/com/google/truth/truth/0.36/truth-0.36.pom.sha1
deleted file mode 100644
index bbc4150..0000000
--- a/common/m2/repository/com/google/truth/truth/0.36/truth-0.36.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-20126d8ba6ee20bde423be4853f08b73dc089bab
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.42/truth-0.42.jar b/common/m2/repository/com/google/truth/truth/0.42/truth-0.42.jar
deleted file mode 100644
index f1e83cf..0000000
--- a/common/m2/repository/com/google/truth/truth/0.42/truth-0.42.jar
+++ /dev/null
Binary files differ
diff --git a/common/m2/repository/com/google/truth/truth/0.42/truth-0.42.jar.sha1 b/common/m2/repository/com/google/truth/truth/0.42/truth-0.42.jar.sha1
deleted file mode 100644
index 8898719..0000000
--- a/common/m2/repository/com/google/truth/truth/0.42/truth-0.42.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b5768f644b114e6cf5c3962c2ebcb072f788dcbb
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/truth/0.42/truth-0.42.pom b/common/m2/repository/com/google/truth/truth/0.42/truth-0.42.pom
deleted file mode 100644
index 2c2ebdc..0000000
--- a/common/m2/repository/com/google/truth/truth/0.42/truth-0.42.pom
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.google.truth</groupId>
-    <artifactId>truth-parent</artifactId>
-    <version>0.42</version>
-  </parent>
-  <artifactId>truth</artifactId>
-  <name>Truth Core</name>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.checkerframework</groupId>
-      <artifactId>checker-compat-qual</artifactId>
-    </dependency>
-    <!-- Manually add a dependency that guava-gwt needs but doesn't declare as of May 2018. -->
-    <dependency>
-      <groupId>org.checkerframework</groupId>
-      <artifactId>checker-qual</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.java-diff-utils</groupId>
-      <artifactId>diffutils</artifactId>
-    </dependency>
-    <!-- Required only to build the -gwt sub-artifact. -->
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.auto.value</groupId>
-      <artifactId>auto-value-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.auto.value</groupId>
-      <artifactId>auto-value</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-gwt</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-testlib</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.testing.compile</groupId>
-      <artifactId>compile-testing</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.errorprone</groupId>
-      <artifactId>error_prone_annotations</artifactId>
-    </dependency>
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/java</directory>
-        <excludes>
-          <exclude>**/*.java</exclude>
-          <exclude>**/*.gwt.xml</exclude>
-        </excludes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource><directory>src/test/java</directory></testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/super/**/*.java</exclude>
-          </excludes>
-          <testExcludes>
-            <testExclude>**/super/**/*.java</testExclude>
-            <!-- Requires Java 8. -->
-            <testExclude>**/EmployeeSubjectTest.java</testExclude>
-          </testExcludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/super/**</exclude>
-            <exclude>**/*.gwt.xml</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <!-- TODO(cgruber): Replace this with Gwt annotation processing plugin. -->
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-gwt-sources</id>
-            <phase>post-integration-test</phase>
-            <goals><goal>jar</goal></goals>
-            <configuration>
-              <classifier>gwt</classifier>
-              <classesDirectory>src/main/java</classesDirectory>
-              <includes>
-                <include>**/*.java</include>
-                <include>**/*.gwt.xml</include>
-              </includes>
-              <excludes>
-                <exclude>com/google/common/truth/ClassSubject.java</exclude>
-                <exclude>com/google/common/truth/Expect.java</exclude>
-                <exclude>com/google/common/truth/IteratingVerb.java</exclude>
-                <exclude>com/google/common/truth/ReflectionUtil.java</exclude>
-                <exclude>com/google/common/truth/codegen/**</exclude>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/*GwtTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>gwt-test</id>
-            <goals><goal>test</goal></goals>
-            <configuration>
-              <mode>htmlunit</mode>
-              <productionMode>true</productionMode>
-              <sourceLevel>auto</sourceLevel>
-              <userAgents>gecko1_8</userAgents>
-              <includes>**/*GwtTest.java</includes>
-              <!-- Keep these timeouts very large because, if we hit the timeout, the tests silently pass :( -->
-              <testTimeOut>86400 <!-- seconds --></testTimeOut>
-              <testMethodTimeout>1440 <!-- minutes --></testMethodTimeout>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0.1</version>
-      </plugin>
-    </plugins>
-  </reporting>
-  <profiles>
-    <profile>
-      <id>java8</id>
-      <activation>
-        <jdk>[1.8,)</jdk>
-      </activation>
-      <properties>
-        <javadoc.param>-Xdoclint:none</javadoc.param>
-      </properties>
-    </profile>
-  </profiles>
-</project>
diff --git a/common/m2/repository/com/google/truth/truth/0.42/truth-0.42.pom.sha1 b/common/m2/repository/com/google/truth/truth/0.42/truth-0.42.pom.sha1
deleted file mode 100644
index 0547ec2..0000000
--- a/common/m2/repository/com/google/truth/truth/0.42/truth-0.42.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-26e90d6db2805c4610405a24f232f6661fda4f18
\ No newline at end of file
diff --git a/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0-sources.jar b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0-sources.jar
new file mode 100644
index 0000000..3a5311c
--- /dev/null
+++ b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0-sources.jar
Binary files differ
diff --git a/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0-sources.jar.md5 b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0-sources.jar.md5
new file mode 100644
index 0000000..406b1cf
--- /dev/null
+++ b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0-sources.jar.md5
@@ -0,0 +1 @@
+5ebaab8f4d1b096f8fa3516a4b3e593e
\ No newline at end of file
diff --git a/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0-sources.jar.sha1 b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0-sources.jar.sha1
new file mode 100644
index 0000000..19d7854
--- /dev/null
+++ b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0-sources.jar.sha1
@@ -0,0 +1 @@
+2b4f77a934ccd677818da63f88f6a7eba8dcf84e
\ No newline at end of file
diff --git a/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.jar b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.jar
new file mode 100644
index 0000000..a3c5efc
--- /dev/null
+++ b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.jar
Binary files differ
diff --git a/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.jar.md5 b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.jar.md5
new file mode 100644
index 0000000..916aaf6
--- /dev/null
+++ b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.jar.md5
@@ -0,0 +1 @@
+17bdab737df560182fbabbcf2569fb42
\ No newline at end of file
diff --git a/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.jar.sha1 b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.jar.sha1
new file mode 100644
index 0000000..c7c511f
--- /dev/null
+++ b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.jar.sha1
@@ -0,0 +1 @@
+0e7c4b4fd5d64ea6ae883ffd0a08eb787a8be626
\ No newline at end of file
diff --git a/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.module b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.module
new file mode 100644
index 0000000..5f1b5de
--- /dev/null
+++ b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.module
@@ -0,0 +1,117 @@
+{
+  "formatVersion": "1.1",
+  "component": {
+    "url": "../../wire-runtime-multiplatform/3.6.0/wire-runtime-multiplatform-3.6.0.module",
+    "group": "com.squareup.wire",
+    "module": "wire-runtime-multiplatform",
+    "version": "3.6.0",
+    "attributes": {
+      "org.gradle.status": "release"
+    }
+  },
+  "createdBy": {
+    "gradle": {
+      "version": "6.7",
+      "buildId": "zczbglipjfarxeyg6iilul26le"
+    }
+  },
+  "variants": [
+    {
+      "name": "jvm-api",
+      "attributes": {
+        "org.gradle.libraryelements": "jar",
+        "org.gradle.usage": "java-api",
+        "org.jetbrains.kotlin.platform.type": "jvm"
+      },
+      "dependencies": [
+        {
+          "group": "org.jetbrains.kotlin",
+          "module": "kotlin-stdlib-jdk8",
+          "version": {
+            "requires": "1.4.10"
+          }
+        },
+        {
+          "group": "com.squareup.okio",
+          "module": "okio-multiplatform",
+          "version": {
+            "requires": "2.8.0"
+          }
+        },
+        {
+          "group": "org.jetbrains.kotlin",
+          "module": "kotlin-stdlib-common",
+          "version": {
+            "requires": "1.4.10"
+          }
+        }
+      ],
+      "files": [
+        {
+          "name": "wire-runtime-jvm-3.6.0.jar",
+          "url": "wire-runtime-3.6.0.jar",
+          "size": 182871,
+          "sha512": "f9bcc480f38e3cfe6c743ad44a0e78a231a1e0c50ee4a136fdb98a4631cd0d04b22cadddabe5db329b63a42275c741454be61239c6bf93d62329581dfeaf35e0",
+          "sha256": "ac41d3f9b8a88046788c6827b0519bf0c53dcc271f598f48aa666c6f5a9523d0",
+          "sha1": "0e7c4b4fd5d64ea6ae883ffd0a08eb787a8be626",
+          "md5": "17bdab737df560182fbabbcf2569fb42"
+        }
+      ]
+    },
+    {
+      "name": "jvm-runtime",
+      "attributes": {
+        "org.gradle.libraryelements": "jar",
+        "org.gradle.usage": "java-runtime",
+        "org.jetbrains.kotlin.platform.type": "jvm"
+      },
+      "dependencies": [
+        {
+          "group": "org.jetbrains.kotlin",
+          "module": "kotlin-stdlib-jdk8",
+          "version": {
+            "requires": "1.4.10"
+          }
+        },
+        {
+          "group": "com.squareup.okio",
+          "module": "okio-multiplatform",
+          "version": {
+            "requires": "2.8.0"
+          }
+        },
+        {
+          "group": "org.jetbrains.kotlin",
+          "module": "kotlin-stdlib-common",
+          "version": {
+            "requires": "1.4.10"
+          }
+        }
+      ],
+      "files": [
+        {
+          "name": "wire-runtime-jvm-3.6.0.jar",
+          "url": "wire-runtime-3.6.0.jar",
+          "size": 182871,
+          "sha512": "f9bcc480f38e3cfe6c743ad44a0e78a231a1e0c50ee4a136fdb98a4631cd0d04b22cadddabe5db329b63a42275c741454be61239c6bf93d62329581dfeaf35e0",
+          "sha256": "ac41d3f9b8a88046788c6827b0519bf0c53dcc271f598f48aa666c6f5a9523d0",
+          "sha1": "0e7c4b4fd5d64ea6ae883ffd0a08eb787a8be626",
+          "md5": "17bdab737df560182fbabbcf2569fb42"
+        }
+      ]
+    },
+    {
+      "name": "metadata-api",
+      "attributes": {
+        "org.gradle.usage": "kotlin-api",
+        "org.jetbrains.kotlin.platform.type": "common"
+      },
+      "available-at": {
+        "url": "../../wire-runtime-metadata/3.6.0/wire-runtime-metadata-3.6.0.module",
+        "group": "com.squareup.wire",
+        "module": "wire-runtime-metadata",
+        "version": "3.6.0"
+      }
+    }
+  ]
+}
diff --git a/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.module.md5 b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.module.md5
new file mode 100644
index 0000000..b7437d8
--- /dev/null
+++ b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.module.md5
@@ -0,0 +1 @@
+9082f60aca6a3bc2a4975d826f7432ee
\ No newline at end of file
diff --git a/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.module.sha1 b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.module.sha1
new file mode 100644
index 0000000..74deaaf
--- /dev/null
+++ b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.module.sha1
@@ -0,0 +1 @@
+6309a9a4a28bbde837c5b0bb1c01246412f22330
\ No newline at end of file
diff --git a/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.pom b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.pom
new file mode 100644
index 0000000..8fede2e
--- /dev/null
+++ b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.pom
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.squareup.wire</groupId>
+  <artifactId>wire-runtime</artifactId>
+  <version>3.6.0</version>
+  <dependencies>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <version>1.4.10</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okio</groupId>
+      <artifactId>okio</artifactId>
+      <version>2.8.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-common</artifactId>
+      <version>1.4.10</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <description>Multiplatform runtime library to support generated code</description>
+  <name>Wire Multiplatform Runtime (Experimental)</name>
+  <url>https://github.com/square/wire</url>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <url>https://github.com/square/wire</url>
+    <connection>scm:git:https://github.com/square/wire.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/square/wire.git</developerConnection>
+  </scm>
+  <developers>
+    <developer>
+      <id>square</id>
+      <name>Square, Inc.</name>
+    </developer>
+  </developers>
+</project>
diff --git a/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.pom.md5 b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.pom.md5
new file mode 100644
index 0000000..af980ab
--- /dev/null
+++ b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.pom.md5
@@ -0,0 +1 @@
+32fe33b685c82a8f242f1961bf1ece9d
\ No newline at end of file
diff --git a/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.pom.sha1 b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.pom.sha1
new file mode 100644
index 0000000..32f4781
--- /dev/null
+++ b/common/m2/repository/com/squareup/wire/wire-runtime/3.6.0/wire-runtime-3.6.0.pom.sha1
@@ -0,0 +1 @@
+4d014a23cec685a9b1a2426c21136cd18c7467cf
\ No newline at end of file
diff --git a/common/m2/repository/javax/annotation/javax.annotation-api/Android.bp b/common/m2/repository/javax/annotation/javax.annotation-api/Android.bp
new file mode 100644
index 0000000..f2c9431
--- /dev/null
+++ b/common/m2/repository/javax/annotation/javax.annotation-api/Android.bp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package {
+    default_applicable_licenses: [
+        "prebuilts_tools_common_m2_repository_javax_annotation_javax.annotation-api_license",
+    ],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+// See: http://go/android-license-faq
+license {
+    name: "prebuilts_tools_common_m2_repository_javax_annotation_javax.annotation-api_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-CDDL",
+        "SPDX-license-identifier-CDDL-1.0",
+        "SPDX-license-identifier-GPL",
+        "SPDX-license-identifier-GPL-2.0",
+        "SPDX-license-identifier-LGPL",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
+java_import {
+    name: "javax_annotation-api_1.3.2",
+    host_supported: true,
+    jars: ["1.3.2/javax.annotation-api-1.3.2.jar"],
+    sdk_version: "current",
+}
diff --git a/linux-x86_64/perfetto/configs/long_trace_config.textproto b/linux-x86_64/perfetto/configs/long_trace_config.textproto
index 0a2a84b..7e29012 100644
--- a/linux-x86_64/perfetto/configs/long_trace_config.textproto
+++ b/linux-x86_64/perfetto/configs/long_trace_config.textproto
@@ -64,6 +64,7 @@
       ftrace_events: "dmabuf_heap/dma_heap_stat"
       ftrace_events: "oom_score_adj_update"
       ftrace_events: "gpu_mem/gpu_mem_total"
+      ftrace_events: "fastrpc/fastrpc_dma_stat"
 
       # Old (kernel) LMK
       ftrace_events: "lowmemorykiller/lowmemory_kill"
@@ -125,3 +126,17 @@
     }
   }
 }
+
+data_sources {
+  config {
+    name: "android.power"
+    target_buffer: 1
+    android_power_config {
+      battery_poll_ms: 5000
+      collect_power_rails: true
+      battery_counters: BATTERY_COUNTER_CAPACITY_PERCENT
+      battery_counters: BATTERY_COUNTER_CHARGE
+      battery_counters: BATTERY_COUNTER_CURRENT
+    }
+  }
+}
diff --git a/linux-x86_64/perfetto/configs/trace_config.textproto b/linux-x86_64/perfetto/configs/trace_config.textproto
index 04f7757..3b15481 100644
--- a/linux-x86_64/perfetto/configs/trace_config.textproto
+++ b/linux-x86_64/perfetto/configs/trace_config.textproto
@@ -64,6 +64,7 @@
       ftrace_events: "dmabuf_heap/dma_heap_stat"
       ftrace_events: "oom_score_adj_update"
       ftrace_events: "gpu_mem/gpu_mem_total"
+      ftrace_events: "fastrpc/fastrpc_dma_stat"
 
       # Old (kernel) LMK
       ftrace_events: "lowmemorykiller/lowmemory_kill"
diff --git a/linux-x86_64/perfetto/configs/trace_config_detailed.textproto b/linux-x86_64/perfetto/configs/trace_config_detailed.textproto
index 27badf8..cc1e1d6 100644
--- a/linux-x86_64/perfetto/configs/trace_config_detailed.textproto
+++ b/linux-x86_64/perfetto/configs/trace_config_detailed.textproto
@@ -73,6 +73,7 @@
       ftrace_events: "dmabuf_heap/dma_heap_stat"
       ftrace_events: "oom_score_adj_update"
       ftrace_events: "gpu_mem/gpu_mem_total"
+      ftrace_events: "fastrpc/fastrpc_dma_stat"
 
       # Old (kernel) LMK
       ftrace_events: "lowmemorykiller/lowmemory_kill"
@@ -146,3 +147,9 @@
     }
   }
 }
+
+data_sources: {
+  config: {
+    name: "android.surfaceflinger.frametimeline"
+  }
+}
diff --git a/linux-x86_64/perfetto/configs/trace_config_experimental.textproto b/linux-x86_64/perfetto/configs/trace_config_experimental.textproto
index 54740f4..46b0421 100644
--- a/linux-x86_64/perfetto/configs/trace_config_experimental.textproto
+++ b/linux-x86_64/perfetto/configs/trace_config_experimental.textproto
@@ -64,6 +64,7 @@
       ftrace_events: "dmabuf_heap/dma_heap_stat"
       ftrace_events: "oom_score_adj_update"
       ftrace_events: "gpu_mem/gpu_mem_total"
+      ftrace_events: "fastrpc/fastrpc_dma_stat"
 
       # Old (kernel) LMK
       ftrace_events: "lowmemorykiller/lowmemory_kill"