Snap for 7171598 from 4de802c98f6c0030603b37726e485dac4f356cb0 to sc-release

Change-Id: I3439db2c13020d88b35a1a70e69044aa40427ff1
diff --git a/Android.bp b/Android.bp
index eb14249..d1a7625 100644
--- a/Android.bp
+++ b/Android.bp
@@ -60,6 +60,11 @@
 java_test {
     name: "junit-params-test",
     host_supported: true,
+    // Don't consider those unit tests, they would be hard to maintain since they are
+    // from external, and have dependencies on the junit version.
+    test_options: {
+        unit_test: false,
+    },
     srcs: ["src/test/java/**/*.java"],
     java_resource_dirs: ["src/test/resources"],
     sdk_version: "core_current",