Merge "Link to native_heapdump_viewer.py."
diff --git a/linker/Android.bp b/linker/Android.bp
index 9e18954..78d425e 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -105,6 +105,7 @@
         },
         x86: {
             srcs: ["arch/x86/begin.S"],
+            cflags: ["-D__work_around_b_24465209__"],
             version_script: "linker.generic.map",
         },
         x86_64: {