Snap for 8183220 from f5a4a85aef5a5bb06474b3c16a665b59bb398af5 to mainline-adbd-release

Change-Id: I4794b4bc257ff1c08d9c05beb285d804be1d0b9e
diff --git a/filegroups/suite/compatibility-host-util.jar b/filegroups/suite/compatibility-host-util.jar
index 0bc9d04..8de3b47 100755
--- a/filegroups/suite/compatibility-host-util.jar
+++ b/filegroups/suite/compatibility-host-util.jar
Binary files differ
diff --git a/filegroups/suite/compatibility-tradefed.jar b/filegroups/suite/compatibility-tradefed.jar
index b87f284..89da6c1 100755
--- a/filegroups/suite/compatibility-tradefed.jar
+++ b/filegroups/suite/compatibility-tradefed.jar
Binary files differ
diff --git a/filegroups/tradefed/TradeFedTestApp.apk b/filegroups/tradefed/TradeFedTestApp.apk
index 76918f7..e4dec13 100755
--- a/filegroups/tradefed/TradeFedTestApp.apk
+++ b/filegroups/tradefed/TradeFedTestApp.apk
Binary files differ
diff --git a/filegroups/tradefed/TradeFedUiTestApp.apk b/filegroups/tradefed/TradeFedUiTestApp.apk
index fa4dbd5..cb7e956 100755
--- a/filegroups/tradefed/TradeFedUiTestApp.apk
+++ b/filegroups/tradefed/TradeFedUiTestApp.apk
Binary files differ
diff --git a/filegroups/tradefed/loganalysis.jar b/filegroups/tradefed/loganalysis.jar
index ab5eef1..6c661d8 100755
--- a/filegroups/tradefed/loganalysis.jar
+++ b/filegroups/tradefed/loganalysis.jar
Binary files differ
diff --git a/filegroups/tradefed/tradefed-contrib.jar b/filegroups/tradefed/tradefed-contrib.jar
index 083ac12..a1e7d5f 100755
--- a/filegroups/tradefed/tradefed-contrib.jar
+++ b/filegroups/tradefed/tradefed-contrib.jar
Binary files differ
diff --git a/filegroups/tradefed/tradefed-test-framework.jar b/filegroups/tradefed/tradefed-test-framework.jar
index 6b1db67..f48ce00 100755
--- a/filegroups/tradefed/tradefed-test-framework.jar
+++ b/filegroups/tradefed/tradefed-test-framework.jar
Binary files differ
diff --git a/filegroups/tradefed/tradefed-tests.jar b/filegroups/tradefed/tradefed-tests.jar
index c1dce7b..ba9d6bd 100755
--- a/filegroups/tradefed/tradefed-tests.jar
+++ b/filegroups/tradefed/tradefed-tests.jar
Binary files differ
diff --git a/filegroups/tradefed/tradefed.jar b/filegroups/tradefed/tradefed.jar
index 5fbe4b1..cb7aae7 100755
--- a/filegroups/tradefed/tradefed.jar
+++ b/filegroups/tradefed/tradefed.jar
Binary files differ
diff --git a/filegroups/tradefed/version.txt b/filegroups/tradefed/version.txt
index 31fb6fe..b62e802 100755
--- a/filegroups/tradefed/version.txt
+++ b/filegroups/tradefed/version.txt
@@ -1 +1 @@
-7926988
+8158947