Merge "Disable VNDK and LLNDK renderscript libraries for riscv64" am: 21b00ef155 am: 2763906a15 am: 1502bfa428

Original change: https://android-review.googlesource.com/c/platform/external/llvm/+/2281807

Change-Id: Icdc5108a567f49c922a1dd026110bfe31f48cc5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index cbc59cb..4189f30 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,6 +53,11 @@
     sanitize: {
         hwaddress: false, // code size b/112437884
     },
+    arch: {
+        riscv64: {
+            enabled: false,
+        },
+    },
 }
 
 // This module defines all of the defaults used to compiled llvm, except for