Merge "Cleanup framework-all usage"

services/Android.bp

@@ -117,9 +117,6 @@ droidstubs {
         " --hide ReferencesHidden" +
         " --hide DeprecationMismatch" +
         " --hide HiddenTypedefConstant",
-    libs: [
-        "framework-all",
-    ],
     visibility: ["//visibility:private"],
 }
 

test-mock/Android.bp

@@ -28,7 +28,7 @@ java_sdk_library {
         ":framework_native_aidl",
     ],
     libs: [
-        "framework-all",
+        "framework",
         "app-compat-annotations",
         "unsupportedappusage",
     ],