Merge commit '1f9e95650b7fae167d99d0ac4abd67a44d62241a' into HEAD

Change-Id: Ic109be4aa648c52ab8ec5e4d529f769fbaad3527
diff --git a/Android.bp b/Android.bp
index e2cd5fe..8a394fa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -117,7 +117,7 @@
     srcs: ["llvm-rs-as.cpp"],
 
     static_libs: ["libslang"] + static_libraries_needed_by_slang,
-    shared_libs: ["libLLVM"],
+    shared_libs: ["libLLVM_android"],
 
     product_variables: {
         unbundled_build: {
@@ -169,8 +169,8 @@
 
     shared_libs: [
         "libbcinfo",
-        "libclang",
-        "libLLVM",
+        "libclang_android",
+        "libLLVM_android",
     ],
 
     target: {