Keep template_Android.bp in sync with Android.bp

Change-Id: I79740746a306212b6632103244645a8c530032c5
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/71409
Tested-by: Jean-François Geyelin <jif@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Jean-François Geyelin <jif@google.com>

third_party/llvm-16.0/scripts/template_Android.bp

diff --git a/third_party/llvm-16.0/scripts/template_Android.bp b/third_party/llvm-16.0/scripts/template_Android.bp
index 2053c80..9d15ee3 100644
--- a/third_party/llvm-16.0/scripts/template_Android.bp
+++ b/third_party/llvm-16.0/scripts/template_Android.bp
@@ -72,6 +72,8 @@
         "-DBLAKE3_NO_SSE41",
         "-DBLAKE3_NO_SSE2",
         "-DBLAKE3_USE_NEON=0",
+        // Avoid collision with LLVM's "llvm::jitlink::i386" namespace.
+        "-Ui386",
     ],
 
     sanitize: {