Merge "Upgrade arm-optimized-routines to 9c8399909a9835e6f55977df1661cf6306c56707"
diff --git a/Android.bp b/Android.bp
index 3f3f563..0eeff07 100755
--- a/Android.bp
+++ b/Android.bp
@@ -6,6 +6,9 @@
     cflags: [
         "-Werror",
         "-O2",
+        // We're actually implementing bionic here, so we don't want <math.h>
+        // to try to be helpful by renaming long double routines.
+        "-D__BIONIC_LP32_USE_LONG_DOUBLE",
         "-DWANT_ROUNDING=0",
         "-DWANT_ERRNO=0",
         "-DFLT_EVAL_METHOD=0",