Snap for 10447354 from 8d0176459cfc11e28e9427a7eadcf7a42f654f62 to mainline-tethering-release

Change-Id: I0cb858880294706755e2004097e498bb22937add
diff --git a/Android.bp b/Android.bp
index e0cd159..d97c6c3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -101,7 +101,7 @@
     // Work around b/25435766 core2md segfault.
     arch: {
         x86: {
-            clang_cflags: ["-mno-stackrealign"],
+            cflags: ["-mno-stackrealign"],
         },
     },
 }
@@ -120,7 +120,7 @@
     // Work around b/25435766 core2md segfault.
     arch: {
         x86: {
-            clang_cflags: ["-mno-stackrealign"],
+            cflags: ["-mno-stackrealign"],
         },
     },
     cflags: [