Snap for 14548793 from eaae8574783b76cded019297cf87e0baec70f209 to 26Q2-release

Change-Id: I0770d25d84094bcf6f0746bfc4002fb8ae99463a

Android.bp

diff --git a/Android.bp b/Android.bp
index c7c981f..4aa8df3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,11 +46,6 @@
 }
 
 java_import_host {
-    name: "vogar-jsr305",
-    jars: ["lib/jsr305.jar"],
-}
-
-java_import_host {
     name: "vogar-kxml-libcore-20110123",
     jars: ["lib/kxml-libcore-20110123.jar"],
 }
@@ -67,9 +62,9 @@
         "caliper",
         "gson",
         "guava",
+        "jsr305",
         "junit",
         "testng",
-        "vogar-jsr305",
         "vogar-kxml-libcore-20110123",
     ],
     // Vogar uses android.jar.

lib/jsr305.jar

diff --git a/lib/jsr305.jar b/lib/jsr305.jar
deleted file mode 100644
index 57a62c1..0000000
--- a/lib/jsr305.jar
+++ /dev/null
Binary files differ

lib/jsr305.jar.txt

diff --git a/lib/jsr305.jar.txt b/lib/jsr305.jar.txt
deleted file mode 100644
index 6736681..0000000
--- a/lib/jsr305.jar.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2007-2009, JSR305 expert group
-All rights reserved.
-
-http://www.opensource.org/licenses/bsd-license.php
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, 
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, 
-      this list of conditions and the following disclaimer in the documentation 
-      and/or other materials provided with the distribution.
-    * Neither the name of the JSR305 expert group nor the names of its 
-      contributors may be used to endorse or promote products derived from 
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGE.

test/vogar/android/DeviceRuntimeAdbTargetTest.java

diff --git a/test/vogar/android/DeviceRuntimeAdbTargetTest.java b/test/vogar/android/DeviceRuntimeAdbTargetTest.java
index 37f6577..9e0de56 100644
--- a/test/vogar/android/DeviceRuntimeAdbTargetTest.java
+++ b/test/vogar/android/DeviceRuntimeAdbTargetTest.java
@@ -68,6 +68,7 @@
                         + "cd /work"
                         + " &&"
                         + " ANDROID_DATA=runner"
+                        + " ANDROID_NO_USE_FWMARK_CLIENT=1"
                         + " dalvikvm"
                         + " -classpath"
                         + " classes"
@@ -102,6 +103,7 @@
                         + "cd /work"
                         + " &&"
                         + " ANDROID_DATA=runner"
+                        + " ANDROID_NO_USE_FWMARK_CLIENT=1"
                         + " dalvikvm"
                         + " -classpath"
                         + " classes"

test/vogar/android/DeviceRuntimeSshTargetTest.java

diff --git a/test/vogar/android/DeviceRuntimeSshTargetTest.java b/test/vogar/android/DeviceRuntimeSshTargetTest.java
index b36670d..bde7abb 100644
--- a/test/vogar/android/DeviceRuntimeSshTargetTest.java
+++ b/test/vogar/android/DeviceRuntimeSshTargetTest.java
@@ -62,6 +62,7 @@
                         + "cd /work"
                         + " &&"
                         + " ANDROID_DATA=runner"
+                        + " ANDROID_NO_USE_FWMARK_CLIENT=1"
                         + " dalvikvm"
                         + " -classpath"
                         + " classes"