Merge "Use framework-annotation-libs for hwbinder-stubs-docs" am: 35f70208f8 am: b4f0aacecd am: ad8bcb3ac6

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

Change-Id: I786eec77e59d86f204108830a5f2f1eca4a815ed
diff --git a/StubLibraries.bp b/StubLibraries.bp
index c61f7c6..9b43749 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -449,6 +449,7 @@
         "core/java/android/os/RemoteException.java",
         "core/java/android/util/AndroidException.java",
     ],
+    libs: ["framework-annotations-lib"],
     installable: false,
     sdk_version: "core_platform",
     annotations_enabled: true,
@@ -462,7 +463,7 @@
 java_library_static {
     name: "hwbinder.stubs",
     sdk_version: "core_current",
-    libs: ["stub-annotations"],
+    libs: ["framework-annotations-lib"],
     srcs: [
         ":hwbinder-stubs-docs",
     ],