Snap for 4447680 from b0442bf71f8e5c37070ae9eb8af72f0cd2f20b09 to pi-release

Change-Id: Id91813e4c881af72da296e38a2d813d260464228
diff --git a/lib/SPIRV/Android.bp b/lib/SPIRV/Android.bp
index 2fcad90..846b430 100644
--- a/lib/SPIRV/Android.bp
+++ b/lib/SPIRV/Android.bp
@@ -77,7 +77,7 @@
         },
     },
 
-    shared_libs: ["libLLVM"],
+    shared_libs: ["libLLVM_android"],
 
     cflags: [
         "-D_SPIRV_LLVM_API",
diff --git a/tools/llvm-spirv/Android.bp b/tools/llvm-spirv/Android.bp
index b5fae62..2ad2c93 100644
--- a/tools/llvm-spirv/Android.bp
+++ b/tools/llvm-spirv/Android.bp
@@ -39,7 +39,7 @@
     },
 
     shared_libs: [
-        "libLLVM",
+        "libLLVM_android",
         "libSPIRV",
     ],