diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree
index 0ed8e20f1..a8447948d 100644
--- a/build/sdk-darwin-x86.atree
+++ b/build/sdk-darwin-x86.atree
@@ -28,11 +28,11 @@ lib/libc++.dylib                                      strip platform-tools/lib/l
 # revision as specified in the source.properties.
 
 
-lib/libLLVM.dylib                                     strip build-tools/${PLATFORM_NAME}/lib/libLLVM.dylib
-lib/libbcc.dylib                                      strip build-tools/${PLATFORM_NAME}/lib/libbcc.dylib
-lib/libbcinfo.dylib                                   strip build-tools/${PLATFORM_NAME}/lib/libbcinfo.dylib
-lib/libclang.dylib                                    strip build-tools/${PLATFORM_NAME}/lib/libclang.dylib
-lib/libc++.dylib                                      strip build-tools/${PLATFORM_NAME}/lib/libc++.dylib
+lib64/libLLVM.dylib                                     strip build-tools/${PLATFORM_NAME}/lib64/libLLVM.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/libc++.dylib                                      strip build-tools/${PLATFORM_NAME}/lib64/libc++.dylib
 
 prebuilts/sdk/tools/darwin/bin/arm-linux-androideabi-ld   strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld
 prebuilts/sdk/tools/darwin/bin/i686-linux-android-ld      strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld
diff --git a/build/sdk-linux-x86.atree b/build/sdk-linux-x86.atree
index 63dcbc35c..f18413d70 100644
--- a/build/sdk-linux-x86.atree
+++ b/build/sdk-linux-x86.atree
@@ -18,7 +18,7 @@
 # Platform Tools Component
 ##############################################################################
 
-lib/libc++.so                                        strip platform-tools/lib/libc++.so
+lib64/libc++.so                                        strip platform-tools/lib64/libc++.so
 
 ##############################################################################
 # Build Tools Component
@@ -28,11 +28,11 @@ lib/libc++.so                                        strip platform-tools/lib/li
 # revision as specified in the source.properties.
 
 
-lib/libLLVM.so                                       strip build-tools/${PLATFORM_NAME}/lib/libLLVM.so
-lib/libbcc.so                                        strip build-tools/${PLATFORM_NAME}/lib/libbcc.so
-lib/libbcinfo.so                                     strip build-tools/${PLATFORM_NAME}/lib/libbcinfo.so
-lib/libclang.so                                      strip build-tools/${PLATFORM_NAME}/lib/libclang.so
-lib/libc++.so                                        strip build-tools/${PLATFORM_NAME}/lib/libc++.so
+lib64/libLLVM.so                                       strip build-tools/${PLATFORM_NAME}/lib64/libLLVM.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/libc++.so                                        strip build-tools/${PLATFORM_NAME}/lib64/libc++.so
 
 prebuilts/sdk/tools/linux/bin/arm-linux-androideabi-ld   strip build-tools/${PLATFORM_NAME}/arm-linux-androideabi-ld
 prebuilts/sdk/tools/linux/bin/i686-linux-android-ld      strip build-tools/${PLATFORM_NAME}/i686-linux-android-ld
diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree
index cbde05748..d2fda32ce 100644
--- a/build/sdk-windows-x86.atree
+++ b/build/sdk-windows-x86.atree
@@ -78,18 +78,18 @@ bin/dexdump.exe                         strip build-tools/${PLATFORM_NAME}/dexdu
 rm build-tools/${PLATFORM_NAME}/llvm-rs-cc
 bin/llvm-rs-cc.exe                      strip build-tools/${PLATFORM_NAME}/llvm-rs-cc.exe
 
-rm build-tools/${PLATFORM_NAME}/lib/libLLVM.so
+rm build-tools/${PLATFORM_NAME}/lib64/libLLVM.so
 lib/libLLVM.dll                         strip build-tools/${PLATFORM_NAME}/lib/libLLVM.dll
 
-rm build-tools/${PLATFORM_NAME}/lib/libclang.so
+rm build-tools/${PLATFORM_NAME}/lib64/libclang.so
 lib/libclang.dll                        strip build-tools/${PLATFORM_NAME}/lib/libclang.dll
 
 #bcc not yet compiled on windows
 
-rm build-tools/${PLATFORM_NAME}/lib/libbcc.so
+rm build-tools/${PLATFORM_NAME}/lib64/libbcc.so
 lib/libbcc.dll                          strip build-tools/${PLATFORM_NAME}/lib/libbcc.dll
 
-rm build-tools/${PLATFORM_NAME}/lib/libbcinfo.so
+rm build-tools/${PLATFORM_NAME}/lib64/libbcinfo.so
 lib/libbcinfo.dll                       strip build-tools/${PLATFORM_NAME}/lib/libbcinfo.dll
 
 rm build-tools/${PLATFORM_NAME}/bcc_compat