Snap for 5978242 from 4bd564486258048f25f0d4ea38ac38cdcfa602c1 to rvc-release

Change-Id: Id90a89c1e1067384de815e0a03cd41eb3e4b98a6
diff --git a/Android.bp b/Android.bp
index 4e3a009..375e36d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,9 +1,10 @@
-cc_library_static {
-    name: "libelf_headers",
+cc_library_headers {
+    name: "elfutils_headers",
     host_supported: true,
     vendor_available: true,
     export_include_dirs: [
         ".",
+        "include",
         "lib",
     ],
     target: {
diff --git a/libelf/Android.bp b/libelf/Android.bp
index c184e28..1c7e647 100644
--- a/libelf/Android.bp
+++ b/libelf/Android.bp
@@ -144,11 +144,11 @@
         "-Wno-pointer-arith",
     ],
 
-    static_libs: [
-        "libz",
-        "libelf_headers",
-    ],
+    static_libs: ["libz"],
 
+    header_libs: ["elfutils_headers"],
+
+    export_header_lib_headers: ["elfutils_headers"],
     export_include_dirs: ["."],
 
     target: {
@@ -168,7 +168,7 @@
 
     visibility: [
         "//device/google/contexthub/util/nanoapp_postprocess",
+        "//external/igt-gpu-tools",
         "//external/mesa3d",
-        "//external/perf_data_converter",
     ],
 }