Merge "Revert^2 "Add <uses-library> information."" am: 6e35bf94 am: 1f906726

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic44dcdcd401dd1afd9d31ba6bc5afb4d36cdb4de

packages/CtsShim/build/Android.bp

@@ -34,6 +34,8 @@ android_app {
 
     compile_multilib: "both",
     jni_libs: ["libshim_jni"],
+
+    uses_libs: ["android.test.runner"],
 }
 
 genrule {
@@ -108,6 +110,7 @@ android_app {
     compile_multilib: "both",
     jni_libs: ["libshim_jni"],
 
+    uses_libs: ["android.test.runner"],
 }
 
 //##########################################################

packages/StatementService/Android.bp

@@ -20,6 +20,7 @@ android_app {
     platform_apis: true,
     privileged: true,
     libs: ["org.apache.http.legacy"],
+    uses_libs: ["org.apache.http.legacy"],
     static_libs: [
         "libprotobuf-java-nano",
         "volley",