Merge "Revert "Add <uses-library> information.""
diff --git a/packages/CtsShim/build/Android.bp b/packages/CtsShim/build/Android.bp
index 14a3376..43e3868 100644
--- a/packages/CtsShim/build/Android.bp
+++ b/packages/CtsShim/build/Android.bp
@@ -34,8 +34,6 @@
 
     compile_multilib: "both",
     jni_libs: ["libshim_jni"],
-
-    uses_libs: ["android.test.runner"],
 }
 
 genrule {
@@ -110,7 +108,6 @@
     compile_multilib: "both",
     jni_libs: ["libshim_jni"],
 
-    uses_libs: ["android.test.runner"],
 }
 
 //##########################################################
diff --git a/packages/StatementService/Android.bp b/packages/StatementService/Android.bp
index 3831fd9..586292e 100644
--- a/packages/StatementService/Android.bp
+++ b/packages/StatementService/Android.bp
@@ -20,7 +20,6 @@
     platform_apis: true,
     privileged: true,
     libs: ["org.apache.http.legacy"],
-    uses_libs: ["org.apache.http.legacy"],
     static_libs: [
         "libprotobuf-java-nano",
         "volley",