diff --git a/Android.bp b/Android.bp
index d112d6b..dbdb2f3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -398,6 +398,10 @@
     },
 
     target: {
+        linux_glibc: {
+            // Remove dependencies on libgcc
+            ldflags: ["-nostdlib"],
+        },
         linux_bionic: {
             enabled: true,
         },
@@ -419,7 +423,6 @@
     name: "libunwind_static",
     defaults: ["libunwind_core_defaults"],
     vendor_available: true,
-    native_bridge_supported: true,
 }
 
 //-----------------------------------------------------------------------
@@ -429,7 +432,6 @@
     name: "libunwindbacktrace",
     defaults: ["libunwind_defaults"],
     vendor_available: true,
-    native_bridge_supported: true,
     sdk_version: "21",
     srcs: [
         "src/unwind/BacktraceWrapper.c",