Snap for 8278022 from 5be0b40f1b990782dbb07490e16c49896f43f6a4 to mainline-resolv-release

Change-Id: I7a08dbbcc5247f21af8e9e2170441764ff7f727c
diff --git a/filegroups/suite/compatibility-host-util.jar b/filegroups/suite/compatibility-host-util.jar
index 8de3b47..a109550 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 89da6c1..052cc7b 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 e4dec13..ce13280 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 cb7e956..281baef 100755
--- a/filegroups/tradefed/TradeFedUiTestApp.apk
+++ b/filegroups/tradefed/TradeFedUiTestApp.apk
Binary files differ
diff --git a/filegroups/tradefed/tradefed-test-framework.jar b/filegroups/tradefed/tradefed-test-framework.jar
index bd15961..e8b1d52 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 d44e862..5abb405 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 cd92a7d..bd3cbe9 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 52c0ceb..7c5b17c 100755
--- a/filegroups/tradefed/version.txt
+++ b/filegroups/tradefed/version.txt
@@ -1 +1 @@
-8145030
+8247317