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

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

Change-Id: I144e656a8f4921b9b8569a93df4f8fa7ec72e9ac

StubLibraries.bp

@@ -434,6 +434,7 @@ droidstubs {
         "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,
@@ -447,7 +448,7 @@ droidstubs {
 java_library_static {
     name: "hwbinder.stubs",
     sdk_version: "core_current",
-    libs: ["stub-annotations"],
+    libs: ["framework-annotations-lib"],
     srcs: [
         ":hwbinder-stubs-docs",
     ],