Merge "Revert "Workaround boot loop by turning off stack protector check for noreturn calls""
diff --git a/libc/Android.bp b/libc/Android.bp
index affe013..b865087 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2147,10 +2147,6 @@
     name: "crt_defaults",
     defaults: ["crt_and_memtag_defaults"],
     system_shared_libs: [],
-
-    conlyflags: [
-        "-mllvm -disable-check-noreturn-call",
-    ]
 }
 
 cc_defaults {