Merge "Revert "Turn on XOM for libc"" am: b656d4a1da
am: 5a7769ecc4

Change-Id: Ieaceae41f836ff5f8f2f6f26ebeb95e5704254d1
diff --git a/libc/Android.bp b/libc/Android.bp
index 262d951..489918b 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -85,6 +85,8 @@
             no_libcrt: true,
         },
     },
+    // TODO(ivanlozano): Remove after b/118321713
+    xom: false,
 }
 
 // ========================================================