diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree
index bb40494dd..ad58fc5dc 100644
--- a/build/sdk-darwin-x86.atree
+++ b/build/sdk-darwin-x86.atree
@@ -28,10 +28,10 @@ lib/libc++.dylib                                      strip platform-tools/lib/l
 # revision as specified in the source.properties.
 
 
-lib64/libLLVM.dylib                                     strip build-tools/${PLATFORM_NAME}/lib64/libLLVM.dylib
+lib64/libLLVM_android.dylib                             strip build-tools/${PLATFORM_NAME}/lib64/libLLVM_android.dylib
 lib64/libbcc.dylib                                      strip build-tools/${PLATFORM_NAME}/lib64/libbcc.dylib
 lib64/libbcinfo.dylib                                   strip build-tools/${PLATFORM_NAME}/lib64/libbcinfo.dylib
-lib64/libclang.dylib                                    strip build-tools/${PLATFORM_NAME}/lib64/libclang.dylib
+lib64/libclang_android.dylib                            strip build-tools/${PLATFORM_NAME}/lib64/libclang_android.dylib
 lib64/libc++.dylib                                      strip build-tools/${PLATFORM_NAME}/lib64/libc++.dylib
 lib64/libaapt2_jni.dylib                                strip build-tools/${PLATFORM_NAME}/lib64/libaapt2_jni.dylib
 
diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree
index 07ad1ccbc..c5f97f65e 100644
--- a/build/sdk-linux-x86.atree
+++ b/build/sdk-linux-x86.atree
@@ -28,10 +28,10 @@ lib64/libc++.so                                        strip platform-tools/lib6
 # revision as specified in the source.properties.
 
 
-lib64/libLLVM.so                                       strip build-tools/${PLATFORM_NAME}/lib64/libLLVM.so
+lib64/libLLVM_android.so                               strip build-tools/${PLATFORM_NAME}/lib64/libLLVM_android.so
 lib64/libbcc.so                                        strip build-tools/${PLATFORM_NAME}/lib64/libbcc.so
 lib64/libbcinfo.so                                     strip build-tools/${PLATFORM_NAME}/lib64/libbcinfo.so
-lib64/libclang.so                                      strip build-tools/${PLATFORM_NAME}/lib64/libclang.so
+lib64/libclang_android.so                              strip build-tools/${PLATFORM_NAME}/lib64/libclang_android.so
 lib64/libc++.so                                        strip build-tools/${PLATFORM_NAME}/lib64/libc++.so
 lib64/libaapt2_jni.so                                  strip build-tools/${PLATFORM_NAME}/lib64/libaapt2_jni.so
 
diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree
index 6845bee3a..71290aa3c 100644
--- a/build/sdk-windows-x86.atree
+++ b/build/sdk-windows-x86.atree
@@ -99,11 +99,11 @@ bin/llvm-rs-cc.exe                      strip build-tools/${PLATFORM_NAME}/llvm-
 # libc++.so not needed on Windows.
 rm build-tools/${PLATFORM_NAME}/lib64/libc++.so
 
-rm build-tools/${PLATFORM_NAME}/lib64/libLLVM.so
-lib/libLLVM.dll                         strip build-tools/${PLATFORM_NAME}/libLLVM.dll
+rm build-tools/${PLATFORM_NAME}/lib64/libLLVM_android.so
+lib/libLLVM_android.dll                 strip build-tools/${PLATFORM_NAME}/libLLVM_android.dll
 
-rm build-tools/${PLATFORM_NAME}/lib64/libclang.so
-lib/libclang.dll                        strip build-tools/${PLATFORM_NAME}/libclang.dll
+rm build-tools/${PLATFORM_NAME}/lib64/libclang_android.so
+lib/libclang_android.dll                strip build-tools/${PLATFORM_NAME}/libclang_android.dll
 
 #bcc not yet compiled on windows