Merge "Header improvements."
diff --git a/libc/Android.bp b/libc/Android.bp
index e30abb7..53a26a6 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -83,6 +83,12 @@
     // lld complains about duplicate symbols in libcrt and libgcc. Suppress the
     // warning since this is intended right now.
     ldflags: ["-Wl,-z,muldefs"],
+
+    product_variables: {
+        experimental_mte: {
+            cflags: ["-DANDROID_EXPERIMENTAL_MTE"],
+        },
+    },
 }
 
 // Defaults for native allocator libs/includes to make it
@@ -1520,6 +1526,7 @@
     name: "libc_common_shared",
 
     cflags: [
+        "-ffreestanding",
         "-fno-stack-protector",
         "-fno-jump-tables",
     ],