Snap for 9051867 from 79263f2134d44e8c94ff0f461cb83f15a6ad132a to mainline-extservices-release

Change-Id: I27b5bbad1a4a8a4228ddc9dd0600e99c6c8a4bc0
diff --git a/filegroups/tradefed/tradefed-test-framework.jar b/filegroups/tradefed/tradefed-test-framework.jar
index 3d88244..7233e7c 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 c5cb126..77aaf1e 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 645372e..b11857a 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 7d07066..ee9708b 100755
--- a/filegroups/tradefed/version.txt
+++ b/filegroups/tradefed/version.txt
@@ -1 +1 @@
-9031424
+9040996