Merge "Normalize some Gfxstream library names" into main

GitOrigin-RevId: 54903471035b2442dc3a9bc147b95b7663cd554c
Change-Id: Ieb9dc99d529438652f51abd9b007eb594030fdae
diff --git a/base/Android.bp b/base/Android.bp
index d01d66c..e225a82 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -11,7 +11,6 @@
 cc_library_static {
     name: "gfxstream_base",
     defaults: ["gfxstream_defaults"],
-    header_libs: ["gfxstream_renderdoc_headers"],
     srcs: [
         "AlignedBuf.cpp",
         "CompressingStream.cpp",
@@ -39,7 +38,8 @@
         "Tracing.cpp",
         "Thread_pthread.cpp",
     ],
-    export_header_lib_headers: ["gfxstream_renderdoc_headers"],
+    header_libs: ["libgfxstream_thirdparty_renderdoc_headers"],
+    export_header_lib_headers: ["libgfxstream_thirdparty_renderdoc_headers"],
     static_libs: ["liblz4"],
 }