diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index 7de72a8..b0e0a23 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -57,6 +57,7 @@
 
 cc_library_headers {
     name: "libbacktrace_headers",
+    vendor_available: true,
     export_include_dirs: ["include"],
 }
 
diff --git a/libutils/Android.bp b/libutils/Android.bp
index 88c9efd..696db3b 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -16,8 +16,16 @@
     name: "libutils_headers",
     vendor_available: true,
     host_supported: true,
+
+    header_libs: ["libsystem_headers",],
+    export_header_lib_headers: ["libsystem_headers",],
     export_include_dirs: ["include"],
+
     target: {
+        android: {
+            header_libs: ["libbacktrace_headers"],
+            export_header_lib_headers: ["libbacktrace_headers"],
+        },
         linux_bionic: {
             enabled: true,
         },
@@ -59,11 +67,9 @@
     cflags: ["-Werror"],
     include_dirs: ["external/safe-iop/include"],
     header_libs: [
-        "libsystem_headers",
         "libutils_headers",
     ],
     export_header_lib_headers: [
-        "libsystem_headers",
         "libutils_headers",
     ],