Snap for 4807121 from dac8340c437c9dafcc7e621f9dafa6a2239c3ca9 to pi-release

Change-Id: I4b803b5233ed4a824267473b2cc8449092966890
diff --git a/linker/Android.bp b/linker/Android.bp
index 7877a37..e122d8f 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: {