Update build-tools to ab/8215242 am: 6450419fe8 am: 08bdbeb6fc am: d3e80d860b

Original change: https://android-review.googlesource.com/c/platform/prebuilts/build-tools/+/1996877

Change-Id: I877cc7b9ff3bbc87a81711f46ed523a9a0d52998
diff --git a/common/framework/javac_extractor.jar b/common/framework/javac_extractor.jar
index 9ab28a0..5344476 100644
--- a/common/framework/javac_extractor.jar
+++ b/common/framework/javac_extractor.jar
Binary files differ
diff --git a/common/framework/turbine.jar b/common/framework/turbine.jar
index 81191f8..e4f77e3 100644
--- a/common/framework/turbine.jar
+++ b/common/framework/turbine.jar
Binary files differ
diff --git a/darwin-x86/bin/acp b/darwin-x86/bin/acp
index 5ff06d8..1c69843 100755
--- a/darwin-x86/bin/acp
+++ b/darwin-x86/bin/acp
Binary files differ
diff --git a/darwin-x86/bin/aidl b/darwin-x86/bin/aidl
index f365864..7cfd128 100755
--- a/darwin-x86/bin/aidl
+++ b/darwin-x86/bin/aidl
Binary files differ
diff --git a/darwin-x86/bin/bison b/darwin-x86/bin/bison
index cdccf6b..013bbf1 100755
--- a/darwin-x86/bin/bison
+++ b/darwin-x86/bin/bison
Binary files differ
diff --git a/darwin-x86/bin/bloaty b/darwin-x86/bin/bloaty
index bf51111..102e3b6 100755
--- a/darwin-x86/bin/bloaty
+++ b/darwin-x86/bin/bloaty
Binary files differ
diff --git a/darwin-x86/bin/bpfmt b/darwin-x86/bin/bpfmt
index db65924..fdfda28 100755
--- a/darwin-x86/bin/bpfmt
+++ b/darwin-x86/bin/bpfmt
Binary files differ
diff --git a/darwin-x86/bin/bzip2 b/darwin-x86/bin/bzip2
index 7e78ed2..d540d2c 100755
--- a/darwin-x86/bin/bzip2
+++ b/darwin-x86/bin/bzip2
Binary files differ
diff --git a/darwin-x86/bin/ckati b/darwin-x86/bin/ckati
index 25e6279..6d058ed 100755
--- a/darwin-x86/bin/ckati
+++ b/darwin-x86/bin/ckati
Binary files differ
diff --git a/darwin-x86/bin/ckati_stamp_dump b/darwin-x86/bin/ckati_stamp_dump
index 3330fdd..b198b36 100755
--- a/darwin-x86/bin/ckati_stamp_dump
+++ b/darwin-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/darwin-x86/bin/flex b/darwin-x86/bin/flex
index 5f7256c..1c33a73 100755
--- a/darwin-x86/bin/flex
+++ b/darwin-x86/bin/flex
Binary files differ
diff --git a/darwin-x86/bin/gavinhoward-bc b/darwin-x86/bin/gavinhoward-bc
index 3ebca1d..f3ea8f8 100755
--- a/darwin-x86/bin/gavinhoward-bc
+++ b/darwin-x86/bin/gavinhoward-bc
Binary files differ
diff --git a/darwin-x86/bin/hidl-gen b/darwin-x86/bin/hidl-gen
index c26cd9b..0abcea2 100755
--- a/darwin-x86/bin/hidl-gen
+++ b/darwin-x86/bin/hidl-gen
Binary files differ
diff --git a/darwin-x86/bin/hidl-lint b/darwin-x86/bin/hidl-lint
index f181765..c3b40b1 100755
--- a/darwin-x86/bin/hidl-lint
+++ b/darwin-x86/bin/hidl-lint
Binary files differ
diff --git a/darwin-x86/bin/m4 b/darwin-x86/bin/m4
index 21c27cd..7f05ebd 100755
--- a/darwin-x86/bin/m4
+++ b/darwin-x86/bin/m4
Binary files differ
diff --git a/darwin-x86/bin/make b/darwin-x86/bin/make
index 9f31cfa..d8c2a3c 100755
--- a/darwin-x86/bin/make
+++ b/darwin-x86/bin/make
Binary files differ
diff --git a/darwin-x86/bin/ninja b/darwin-x86/bin/ninja
index 30e2d0f..1cbe036 100755
--- a/darwin-x86/bin/ninja
+++ b/darwin-x86/bin/ninja
Binary files differ
diff --git a/darwin-x86/bin/one-true-awk b/darwin-x86/bin/one-true-awk
index 172d2b4..3bcbefa 100755
--- a/darwin-x86/bin/one-true-awk
+++ b/darwin-x86/bin/one-true-awk
Binary files differ
diff --git a/darwin-x86/bin/openssl b/darwin-x86/bin/openssl
index 54769d1..c6c6bdb 100755
--- a/darwin-x86/bin/openssl
+++ b/darwin-x86/bin/openssl
Binary files differ
diff --git a/darwin-x86/bin/py2-cmd b/darwin-x86/bin/py2-cmd
index 3215067..9acd718 100755
--- a/darwin-x86/bin/py2-cmd
+++ b/darwin-x86/bin/py2-cmd
Binary files differ
diff --git a/darwin-x86/bin/py3-cmd b/darwin-x86/bin/py3-cmd
index 05adf81..0283c82 100755
--- a/darwin-x86/bin/py3-cmd
+++ b/darwin-x86/bin/py3-cmd
Binary files differ
diff --git a/darwin-x86/bin/py3-launcher-autorun64 b/darwin-x86/bin/py3-launcher-autorun64
index 060f4e4..24cf96a 100755
--- a/darwin-x86/bin/py3-launcher-autorun64
+++ b/darwin-x86/bin/py3-launcher-autorun64
Binary files differ
diff --git a/darwin-x86/bin/py3-launcher64 b/darwin-x86/bin/py3-launcher64
index 0740509..55c5451 100755
--- a/darwin-x86/bin/py3-launcher64
+++ b/darwin-x86/bin/py3-launcher64
Binary files differ
diff --git a/darwin-x86/bin/toybox b/darwin-x86/bin/toybox
index 14293bc..93252f9 100755
--- a/darwin-x86/bin/toybox
+++ b/darwin-x86/bin/toybox
Binary files differ
diff --git a/darwin-x86/bin/xz b/darwin-x86/bin/xz
index 4e0adfb..114f888 100755
--- a/darwin-x86/bin/xz
+++ b/darwin-x86/bin/xz
Binary files differ
diff --git a/darwin-x86/bin/zipalign b/darwin-x86/bin/zipalign
index 9164af2..a817928 100755
--- a/darwin-x86/bin/zipalign
+++ b/darwin-x86/bin/zipalign
Binary files differ
diff --git a/darwin-x86/bin/ziptime b/darwin-x86/bin/ziptime
index adb4c77..915a659 100755
--- a/darwin-x86/bin/ziptime
+++ b/darwin-x86/bin/ziptime
Binary files differ
diff --git a/darwin-x86/bin/ziptool b/darwin-x86/bin/ziptool
index fbe636a..3c71260 100755
--- a/darwin-x86/bin/ziptool
+++ b/darwin-x86/bin/ziptool
Binary files differ
diff --git a/darwin-x86/lib64/libbase.dylib b/darwin-x86/lib64/libbase.dylib
index edcbac3..4b405c7 100755
--- a/darwin-x86/lib64/libbase.dylib
+++ b/darwin-x86/lib64/libbase.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libc++.dylib b/darwin-x86/lib64/libc++.dylib
index 16ffc74..9121ca8 100755
--- a/darwin-x86/lib64/libc++.dylib
+++ b/darwin-x86/lib64/libc++.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libcrypto-host.dylib b/darwin-x86/lib64/libcrypto-host.dylib
index fa90609..22f3965 100755
--- a/darwin-x86/lib64/libcrypto-host.dylib
+++ b/darwin-x86/lib64/libcrypto-host.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libicui18n-host.dylib b/darwin-x86/lib64/libicui18n-host.dylib
index 6048be1..2344f7b 100755
--- a/darwin-x86/lib64/libicui18n-host.dylib
+++ b/darwin-x86/lib64/libicui18n-host.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libicuuc-host.dylib b/darwin-x86/lib64/libicuuc-host.dylib
index 7b2e966..d63cdc0 100755
--- a/darwin-x86/lib64/libicuuc-host.dylib
+++ b/darwin-x86/lib64/libicuuc-host.dylib
Binary files differ
diff --git a/darwin-x86/lib64/liblog.dylib b/darwin-x86/lib64/liblog.dylib
index 27506da..9f0f1b1 100755
--- a/darwin-x86/lib64/liblog.dylib
+++ b/darwin-x86/lib64/liblog.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libsqlite.dylib b/darwin-x86/lib64/libsqlite.dylib
index 9c17d43..3e273f9 100755
--- a/darwin-x86/lib64/libsqlite.dylib
+++ b/darwin-x86/lib64/libsqlite.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libz-host.dylib b/darwin-x86/lib64/libz-host.dylib
index 36bd31b..ee1b38f 100755
--- a/darwin-x86/lib64/libz-host.dylib
+++ b/darwin-x86/lib64/libz-host.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libziparchive.dylib b/darwin-x86/lib64/libziparchive.dylib
index f667d64..41d1c41 100755
--- a/darwin-x86/lib64/libziparchive.dylib
+++ b/darwin-x86/lib64/libziparchive.dylib
Binary files differ
diff --git a/linux-x86/asan/bin/acp b/linux-x86/asan/bin/acp
index f85cf57..3366d1f 100755
--- a/linux-x86/asan/bin/acp
+++ b/linux-x86/asan/bin/acp
Binary files differ
diff --git a/linux-x86/asan/bin/aidl b/linux-x86/asan/bin/aidl
index 18d973a..8021618 100755
--- a/linux-x86/asan/bin/aidl
+++ b/linux-x86/asan/bin/aidl
Binary files differ
diff --git a/linux-x86/asan/bin/ckati b/linux-x86/asan/bin/ckati
index fb915a3..03dc93b 100755
--- a/linux-x86/asan/bin/ckati
+++ b/linux-x86/asan/bin/ckati
Binary files differ
diff --git a/linux-x86/asan/bin/gavinhoward-bc b/linux-x86/asan/bin/gavinhoward-bc
index 78726a6..79a20eb 100755
--- a/linux-x86/asan/bin/gavinhoward-bc
+++ b/linux-x86/asan/bin/gavinhoward-bc
Binary files differ
diff --git a/linux-x86/asan/bin/ninja b/linux-x86/asan/bin/ninja
index f1decd7..fd27185 100755
--- a/linux-x86/asan/bin/ninja
+++ b/linux-x86/asan/bin/ninja
Binary files differ
diff --git a/linux-x86/asan/bin/toybox b/linux-x86/asan/bin/toybox
index 79940d8..559d698 100755
--- a/linux-x86/asan/bin/toybox
+++ b/linux-x86/asan/bin/toybox
Binary files differ
diff --git a/linux-x86/asan/bin/zipalign b/linux-x86/asan/bin/zipalign
index 31c9f66..acf3d57 100755
--- a/linux-x86/asan/bin/zipalign
+++ b/linux-x86/asan/bin/zipalign
Binary files differ
diff --git a/linux-x86/asan/bin/ziptime b/linux-x86/asan/bin/ziptime
index c3b9610..02cdffa 100755
--- a/linux-x86/asan/bin/ziptime
+++ b/linux-x86/asan/bin/ziptime
Binary files differ
diff --git a/linux-x86/asan/bin/ziptool b/linux-x86/asan/bin/ziptool
index aa19256..d8be5b0 100755
--- a/linux-x86/asan/bin/ziptool
+++ b/linux-x86/asan/bin/ziptool
Binary files differ
diff --git a/linux-x86/asan/lib64/libbase.so b/linux-x86/asan/lib64/libbase.so
index d15dad3..4d108d4 100755
--- a/linux-x86/asan/lib64/libbase.so
+++ b/linux-x86/asan/lib64/libbase.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libc++.so b/linux-x86/asan/lib64/libc++.so
index 08ad828..22e34db 100755
--- a/linux-x86/asan/lib64/libc++.so
+++ b/linux-x86/asan/lib64/libc++.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libcrypto-host.so b/linux-x86/asan/lib64/libcrypto-host.so
index 02aeed2..d3ba3a5 100755
--- a/linux-x86/asan/lib64/libcrypto-host.so
+++ b/linux-x86/asan/lib64/libcrypto-host.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libjemalloc5.so b/linux-x86/asan/lib64/libjemalloc5.so
index 8487e0a..2dd72d8 100755
--- a/linux-x86/asan/lib64/libjemalloc5.so
+++ b/linux-x86/asan/lib64/libjemalloc5.so
Binary files differ
diff --git a/linux-x86/asan/lib64/liblog.so b/linux-x86/asan/lib64/liblog.so
index 1953e95..ff93721 100755
--- a/linux-x86/asan/lib64/liblog.so
+++ b/linux-x86/asan/lib64/liblog.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libz-host.so b/linux-x86/asan/lib64/libz-host.so
index e6860f9..3881406 100755
--- a/linux-x86/asan/lib64/libz-host.so
+++ b/linux-x86/asan/lib64/libz-host.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libziparchive.so b/linux-x86/asan/lib64/libziparchive.so
index b14a457..0ebb85c 100755
--- a/linux-x86/asan/lib64/libziparchive.so
+++ b/linux-x86/asan/lib64/libziparchive.so
Binary files differ
diff --git a/linux-x86/bin/acp b/linux-x86/bin/acp
index 28bb545..0051c80 100755
--- a/linux-x86/bin/acp
+++ b/linux-x86/bin/acp
Binary files differ
diff --git a/linux-x86/bin/aidl b/linux-x86/bin/aidl
index 2f34f0a..ad2b072 100755
--- a/linux-x86/bin/aidl
+++ b/linux-x86/bin/aidl
Binary files differ
diff --git a/linux-x86/bin/bison b/linux-x86/bin/bison
index 92e5475..dff701c 100755
--- a/linux-x86/bin/bison
+++ b/linux-x86/bin/bison
Binary files differ
diff --git a/linux-x86/bin/bloaty b/linux-x86/bin/bloaty
index 0a4ae13..1fc38bc 100755
--- a/linux-x86/bin/bloaty
+++ b/linux-x86/bin/bloaty
Binary files differ
diff --git a/linux-x86/bin/bpfmt b/linux-x86/bin/bpfmt
index 3e7d53c..d3e58e7 100755
--- a/linux-x86/bin/bpfmt
+++ b/linux-x86/bin/bpfmt
Binary files differ
diff --git a/linux-x86/bin/bzip2 b/linux-x86/bin/bzip2
index 90051fb..0debfe5 100755
--- a/linux-x86/bin/bzip2
+++ b/linux-x86/bin/bzip2
Binary files differ
diff --git a/linux-x86/bin/ckati b/linux-x86/bin/ckati
index 0522a0b..f404f55 100755
--- a/linux-x86/bin/ckati
+++ b/linux-x86/bin/ckati
Binary files differ
diff --git a/linux-x86/bin/ckati_stamp_dump b/linux-x86/bin/ckati_stamp_dump
index ba3a565..76457fc 100755
--- a/linux-x86/bin/ckati_stamp_dump
+++ b/linux-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/linux-x86/bin/create_minidebuginfo b/linux-x86/bin/create_minidebuginfo
index 8d2dbb8..f9a354e 100755
--- a/linux-x86/bin/create_minidebuginfo
+++ b/linux-x86/bin/create_minidebuginfo
Binary files differ
diff --git a/linux-x86/bin/flex b/linux-x86/bin/flex
index fbd9b9c..5caef46 100755
--- a/linux-x86/bin/flex
+++ b/linux-x86/bin/flex
Binary files differ
diff --git a/linux-x86/bin/gavinhoward-bc b/linux-x86/bin/gavinhoward-bc
index f7cea7f..e5cdc51 100755
--- a/linux-x86/bin/gavinhoward-bc
+++ b/linux-x86/bin/gavinhoward-bc
Binary files differ
diff --git a/linux-x86/bin/hidl-gen b/linux-x86/bin/hidl-gen
index aeea018..ab56189 100755
--- a/linux-x86/bin/hidl-gen
+++ b/linux-x86/bin/hidl-gen
Binary files differ
diff --git a/linux-x86/bin/hidl-lint b/linux-x86/bin/hidl-lint
index af14432..9ac561f 100755
--- a/linux-x86/bin/hidl-lint
+++ b/linux-x86/bin/hidl-lint
Binary files differ
diff --git a/linux-x86/bin/m4 b/linux-x86/bin/m4
index 2946540..e97ae15 100755
--- a/linux-x86/bin/m4
+++ b/linux-x86/bin/m4
Binary files differ
diff --git a/linux-x86/bin/make b/linux-x86/bin/make
index 5ddd3d5..6a17969 100755
--- a/linux-x86/bin/make
+++ b/linux-x86/bin/make
Binary files differ
diff --git a/linux-x86/bin/ninja b/linux-x86/bin/ninja
index 70ec7a6..e1461bf 100755
--- a/linux-x86/bin/ninja
+++ b/linux-x86/bin/ninja
Binary files differ
diff --git a/linux-x86/bin/nsjail b/linux-x86/bin/nsjail
index 956356c..4773679 100755
--- a/linux-x86/bin/nsjail
+++ b/linux-x86/bin/nsjail
Binary files differ
diff --git a/linux-x86/bin/one-true-awk b/linux-x86/bin/one-true-awk
index f639e5d..853c349 100755
--- a/linux-x86/bin/one-true-awk
+++ b/linux-x86/bin/one-true-awk
Binary files differ
diff --git a/linux-x86/bin/openssl b/linux-x86/bin/openssl
index 9c39371..8ff7907 100755
--- a/linux-x86/bin/openssl
+++ b/linux-x86/bin/openssl
Binary files differ
diff --git a/linux-x86/bin/py2-cmd b/linux-x86/bin/py2-cmd
index 0c7ed73..2255547 100755
--- a/linux-x86/bin/py2-cmd
+++ b/linux-x86/bin/py2-cmd
Binary files differ
diff --git a/linux-x86/bin/py3-cmd b/linux-x86/bin/py3-cmd
index 8d0e6f1..5ec694c 100755
--- a/linux-x86/bin/py3-cmd
+++ b/linux-x86/bin/py3-cmd
Binary files differ
diff --git a/linux-x86/bin/py3-launcher-autorun64 b/linux-x86/bin/py3-launcher-autorun64
index 3d5ebe2..9497c44 100755
--- a/linux-x86/bin/py3-launcher-autorun64
+++ b/linux-x86/bin/py3-launcher-autorun64
Binary files differ
diff --git a/linux-x86/bin/py3-launcher64 b/linux-x86/bin/py3-launcher64
index 2f36663..e122120 100755
--- a/linux-x86/bin/py3-launcher64
+++ b/linux-x86/bin/py3-launcher64
Binary files differ
diff --git a/linux-x86/bin/toybox b/linux-x86/bin/toybox
index f878657..886d264 100755
--- a/linux-x86/bin/toybox
+++ b/linux-x86/bin/toybox
Binary files differ
diff --git a/linux-x86/bin/xz b/linux-x86/bin/xz
index c6b71ef..6f5461b 100755
--- a/linux-x86/bin/xz
+++ b/linux-x86/bin/xz
Binary files differ
diff --git a/linux-x86/bin/zipalign b/linux-x86/bin/zipalign
index 7eff5c4..e83aeb0 100755
--- a/linux-x86/bin/zipalign
+++ b/linux-x86/bin/zipalign
Binary files differ
diff --git a/linux-x86/bin/ziptime b/linux-x86/bin/ziptime
index b8b448b..e0a198a 100755
--- a/linux-x86/bin/ziptime
+++ b/linux-x86/bin/ziptime
Binary files differ
diff --git a/linux-x86/bin/ziptool b/linux-x86/bin/ziptool
index 5bb892f..0034211 100755
--- a/linux-x86/bin/ziptool
+++ b/linux-x86/bin/ziptool
Binary files differ
diff --git a/linux-x86/lib64/libbase.so b/linux-x86/lib64/libbase.so
index 22deb54..a81fa45 100755
--- a/linux-x86/lib64/libbase.so
+++ b/linux-x86/lib64/libbase.so
Binary files differ
diff --git a/linux-x86/lib64/libc++.so b/linux-x86/lib64/libc++.so
index af4a59d..17b14c9 100755
--- a/linux-x86/lib64/libc++.so
+++ b/linux-x86/lib64/libc++.so
Binary files differ
diff --git a/linux-x86/lib64/libcrypto-host.so b/linux-x86/lib64/libcrypto-host.so
index 1dd67a7..cd43110 100755
--- a/linux-x86/lib64/libcrypto-host.so
+++ b/linux-x86/lib64/libcrypto-host.so
Binary files differ
diff --git a/linux-x86/lib64/libicui18n-host.so b/linux-x86/lib64/libicui18n-host.so
index 5f2736d..3f1fb13 100755
--- a/linux-x86/lib64/libicui18n-host.so
+++ b/linux-x86/lib64/libicui18n-host.so
Binary files differ
diff --git a/linux-x86/lib64/libicuuc-host.so b/linux-x86/lib64/libicuuc-host.so
index c8ac891..d0e83fd 100755
--- a/linux-x86/lib64/libicuuc-host.so
+++ b/linux-x86/lib64/libicuuc-host.so
Binary files differ
diff --git a/linux-x86/lib64/libjemalloc5.so b/linux-x86/lib64/libjemalloc5.so
index 0de5963..c85b8a4 100755
--- a/linux-x86/lib64/libjemalloc5.so
+++ b/linux-x86/lib64/libjemalloc5.so
Binary files differ
diff --git a/linux-x86/lib64/liblog.so b/linux-x86/lib64/liblog.so
index d2f7c9a..eaf85b2 100755
--- a/linux-x86/lib64/liblog.so
+++ b/linux-x86/lib64/liblog.so
Binary files differ
diff --git a/linux-x86/lib64/libnl.so b/linux-x86/lib64/libnl.so
index abb4218..576d364 100755
--- a/linux-x86/lib64/libnl.so
+++ b/linux-x86/lib64/libnl.so
Binary files differ
diff --git a/linux-x86/lib64/libprotobuf-cpp-full.so b/linux-x86/lib64/libprotobuf-cpp-full.so
index f557857..3b5b9ba 100755
--- a/linux-x86/lib64/libprotobuf-cpp-full.so
+++ b/linux-x86/lib64/libprotobuf-cpp-full.so
Binary files differ
diff --git a/linux-x86/lib64/libsqlite.so b/linux-x86/lib64/libsqlite.so
index 2a44a7c..442b359 100755
--- a/linux-x86/lib64/libsqlite.so
+++ b/linux-x86/lib64/libsqlite.so
Binary files differ
diff --git a/linux-x86/lib64/libz-host.so b/linux-x86/lib64/libz-host.so
index 5e91e4f..ea62227 100755
--- a/linux-x86/lib64/libz-host.so
+++ b/linux-x86/lib64/libz-host.so
Binary files differ
diff --git a/linux-x86/lib64/libziparchive.so b/linux-x86/lib64/libziparchive.so
index 81d792e..8f9735c 100755
--- a/linux-x86/lib64/libziparchive.so
+++ b/linux-x86/lib64/libziparchive.so
Binary files differ
diff --git a/manifest.xml b/manifest.xml
index 53ef14c..06b827d 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -5,13 +5,13 @@
 
   <default remote="aosp" revision="build-tools-release" sync-j="4" />
 
-  <project name="platform/build" path="build/make" revision="34ddb88fdf775d64ee86284af018256df14169f6" upstream="build-tools-release">
+  <project name="platform/build" path="build/make" revision="a1dce5afa791b306206a86ecb7cc0c9ee722bd51" upstream="build-tools-release">
     <linkfile dest="build/tools" src="tools" />
 </project>
 
-  <project name="platform/build/blueprint" path="build/blueprint" revision="00ecb8c0e5ff9b5454dd4cba33cafce0126a6e53" upstream="build-tools-release" />
+  <project name="platform/build/blueprint" path="build/blueprint" revision="bf787a3a6192da7e3f08e5699d98b78e7b4411cd" upstream="build-tools-release" />
 
-  <project name="platform/build/soong" path="build/soong" revision="acdf1517e69d8d35526eafceb3a2b7f11b056cb3" upstream="build-tools-release">
+  <project name="platform/build/soong" path="build/soong" revision="fb9c246868b51714ddb16267a69dea8e2990661b" upstream="build-tools-release">
     <linkfile dest="Android.bp" src="root.bp" />
 
     <linkfile dest="bootstrap.bash" src="bootstrap.bash" />
@@ -19,11 +19,11 @@
 
   <project name="platform/external/golang-protobuf" path="external/golang-protobuf" revision="e0f13d46efe3e0d964f234af25cdefc12e0c2ff2" upstream="build-tools-release" />
 
-  <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="1114124aeed88836946b1fb8acf57e1a23f504d1" upstream="build-tools-release" />
+  <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="0d6452364026068e5aae97cb4ad141719ec756a9" upstream="build-tools-release" />
 
-  <project clone-depth="1" groups="pdk" name="platform/prebuilts/remoteexecution-client" path="prebuilts/remoteexecution-client" revision="8fb6fe783d99c897bf0ed7aa0b2964301f038910" upstream="build-tools-release" />
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/remoteexecution-client" path="prebuilts/remoteexecution-client" revision="947ded9745705dd7e6265801775d7ef8d8798a6f" upstream="build-tools-release" />
 
-  <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="da9595ca639e3714eb7a0cbe0a3c2a4c283fe859" upstream="build-tools-release" />
+  <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="59f6d95d751cfe55e2f31c0277f3122258263176" upstream="build-tools-release" />
 
   <project clone-depth="1" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" revision="7454fb3d3249c268b7e61a6551e4a17dfd031ea9" upstream="build-tools-release" />
 
@@ -35,7 +35,7 @@
 
   <project clone-depth="1" groups="linux" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="cfaa2ca50f534ec2945c2587ffa119519268efad" upstream="build-tools-release" />
 
-  <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="cabef13cf1f4f44e6fd4777b1142422099f4a018" upstream="build-tools-release" />
+  <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="0d2f6c6379552ebd3c36e01fcb59e04e6d9d86c6" upstream="build-tools-release" />
 
   <project clone-depth="1" groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="build-tools-release" />
 
@@ -45,25 +45,25 @@
 
   <project clone-depth="1" groups="darwin" name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="2433f0ca209251e67a89bbaf6c34da9fe54edeac" upstream="build-tools-release" />
 
-  <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="ba52dc0c6b375cee2ad29571fcbac3d89ea5d0dd" upstream="build-tools-release" />
+  <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="fa025317fe2fdc6a904f0efd2d76a3b430319e2c" upstream="build-tools-release" />
 
   <project clone-depth="1" groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="1772993705ea120e5c2f29bf63a37a6151b7d2ff" upstream="build-tools-release" />
 
-  <project clone-depth="1" name="platform/prebuilts/jdk/jdk11" path="prebuilts/jdk/jdk11" revision="fc2b01f9a9d0094202e52350cbe4f24e73b5571c" upstream="build-tools-release" />
+  <project clone-depth="1" name="platform/prebuilts/jdk/jdk11" path="prebuilts/jdk/jdk11" revision="c9180234834a7f4c375309c969df7297564e839d" upstream="build-tools-release" />
 
   <project clone-depth="1" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="74e4f1844dfa9b8df9e0fe2ff34a2ecc24d52b07" upstream="build-tools-release" />
 
   <project clone-depth="1" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="0ff41a53c757fed33a113405c4183dc41951d9d6" upstream="build-tools-release" />
 
-  <project clone-depth="1" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" revision="e8550002871150417e4f7a770b2e5ee106e14f2c" upstream="build-tools-release" />
+  <project clone-depth="1" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" revision="3b85f91c5115fea227aa486371c4665985219b14" upstream="build-tools-release" />
 
-  <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="d0fa52b16a956cf6296e9b458cda8b2b1449f77a" upstream="build-tools-release" />
+  <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="1eb8c4b1509ecd6b6c0513a168683e60051ce571" upstream="build-tools-release" />
 
-  <project clone-depth="1" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" revision="7a3ee96379da9b63207048575a84adadee95f5cc" upstream="build-tools-release" />
+  <project clone-depth="1" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" revision="6f4eef8f12003d86a66df908a95aab18d9fcb779" upstream="build-tools-release" />
 
-  <project name="platform/bionic" path="bionic" revision="4c5278e3d51d352fd2ce859a7ac612376aff7616" upstream="build-tools-release" />
+  <project name="platform/bionic" path="bionic" revision="330bc9ae9352c3e50187f335ce1ed50a28aea8d3" upstream="build-tools-release" />
 
-  <project name="platform/development" path="development" revision="b1dfd3a217a9e672081d3e9d39ac959098c9eaf7" upstream="build-tools-release" />
+  <project name="platform/development" path="development" revision="b629cc47a301c8df57d4b87ee5c0528e78333a5a" upstream="build-tools-release" />
 
   <project name="platform/external/arm-optimized-routines" path="external/arm-optimized-routines" revision="852620871b603d5f3c4fd5995dc117a2ee75554d" upstream="build-tools-release" />
 
@@ -81,7 +81,7 @@
 
   <project name="platform/external/dagger2" path="external/dagger2" revision="beeb8ef36f0a32a04994bd6f1b6a7572fa748f98" upstream="build-tools-release" />
 
-  <project clone-depth="1" name="platform/external/error_prone" path="external/error_prone" revision="d883cd6093b4098b51768109b53cc756164dde30" upstream="build-tools-release" />
+  <project clone-depth="1" name="platform/external/error_prone" path="external/error_prone" revision="133f1d09875d4669ed246d2bca5a18a8caa78ecc" upstream="build-tools-release" />
 
   <project name="platform/external/escapevelocity" path="external/escapevelocity" revision="e3a8bb0fae9c5f25890c84e3378e51373b52a909" upstream="build-tools-release" />
 
@@ -109,9 +109,9 @@
 
   <project name="platform/external/googletest" path="external/googletest" revision="bb39c87e86221774474e8069da6a64d75269c33b" upstream="build-tools-release" />
 
-  <project name="platform/external/guava" path="external/guava" revision="4387e8e1db1aba997d907e7ae1db7b8e26134603" upstream="build-tools-release" />
+  <project name="platform/external/guava" path="external/guava" revision="737d1a0aa4e967ffdc12c0448e03e69ab6e6267b" upstream="build-tools-release" />
 
-  <project name="platform/external/icu" path="external/icu" revision="446246b9b14d3a87916b30ce5956ed27f7daf157" upstream="build-tools-release" />
+  <project name="platform/external/icu" path="external/icu" revision="0aeae4a6138616ded0ef2137b9d724172fa70d79" upstream="build-tools-release" />
 
   <project name="platform/external/javapoet" path="external/javapoet" revision="d274ed4f3e04713ec752625c446b9f59daaa80bb" upstream="build-tools-release" />
 
@@ -139,7 +139,7 @@
 
   <project name="platform/external/lzma" path="external/lzma" revision="cbba1abda3049a875b8148eaf016fdc876702d62" upstream="build-tools-release" />
 
-  <project name="platform/external/musl" path="external/musl" revision="10707edbb9f53d82f0f8f885584032761c6d621a" upstream="build-tools-release" />
+  <project name="platform/external/musl" path="external/musl" revision="db48a375f5aa34beabab6670d90b0e04dcee7648" upstream="build-tools-release" />
 
   <project name="platform/external/pcre" path="external/pcre" revision="c5eaeb0e9ca4b91fb4071b5c674271d2842e9281" upstream="build-tools-release" />
 
@@ -157,9 +157,9 @@
 
   <project name="platform/external/zopfli" path="external/zopfli" revision="8ead122d01356ba52d9673d146dd8148f811ccac" upstream="build-tools-release" />
 
-  <project name="platform/system/core" path="system/core" revision="6b8b7f4543b946cfa94e15067656f50780dd026b" upstream="build-tools-release" />
+  <project name="platform/system/core" path="system/core" revision="b0e86f24a862adc532c5be22fdc45ce6aa71aa8e" upstream="build-tools-release" />
 
-  <project name="platform/system/libbase" path="system/libbase" revision="cc4c564e11b31ce0cadba76ddb86a1e388fa2dc3" upstream="build-tools-release" />
+  <project name="platform/system/libbase" path="system/libbase" revision="44d3a9212e461f13390157ce78f247517546006a" upstream="build-tools-release" />
 
   <project name="platform/system/libhwbinder" path="system/libhwbinder" revision="e1bfa1e4ac4a2cd95784ad9b7d27ebb1f2b24887" upstream="build-tools-release" />
 
@@ -167,13 +167,13 @@
 
   <project name="platform/system/logging" path="system/logging" revision="e723ae4355e61ba140dd5964e87c8bcdbfedf10f" upstream="build-tools-release" />
 
-  <project name="platform/system/unwinding" path="system/unwinding" revision="c16beac4d252aab8d23b18d6ef8ef0fac2615f82" upstream="build-tools-release" />
+  <project name="platform/system/unwinding" path="system/unwinding" revision="687683989d86858a9347f1079f86a71be0f62e18" upstream="build-tools-release" />
 
   <project name="platform/system/tools/xsdc" path="system/tools/xsdc" revision="5e6067967e62fd2d99f4ca163921ef8f7b192d37" upstream="build-tools-release" />
 
-  <project name="platform/test/app_compat/csuite" path="test/app_compat/csuite" revision="b1aa947907e31dc005211f2f65df7671b5977f14" upstream="build-tools-release" />
+  <project name="platform/test/app_compat/csuite" path="test/app_compat/csuite" revision="339f3939935dc741c2719c7bdfa605b58995180f" upstream="build-tools-release" />
 
-  <project name="platform/art" path="art" revision="0b33896f7c679f5a330330cd68248495609e2217" upstream="build-tools-release" />
+  <project name="platform/art" path="art" revision="7f3094c6efe1769f085135e6067279ccf3a3f086" upstream="build-tools-release" />
 
   <project name="platform/build/kati" path="build/kati" revision="6ad4268491b968b4cb257aeeb8c6a605ea8af8bf" upstream="build-tools-release" />
 
@@ -201,13 +201,13 @@
 
   <project name="platform/external/python/cpython2" path="external/python/cpython2" revision="b827859843896500f5b0e2db802b22ee0240956b" upstream="build-tools-release" />
 
-  <project name="platform/external/python/cpython3" path="external/python/cpython3" revision="072d2db63a35a3113d38e1bc64aed3f2420ff137" upstream="build-tools-release" />
+  <project name="platform/external/python/cpython3" path="external/python/cpython3" revision="3735099615d9c32f5a4ef96ea4d25fd76409d0ae" upstream="build-tools-release" />
 
-  <project name="platform/external/toybox" path="external/toybox" revision="ad95266a742e601a96fbe9c9f8277903a66472b7" upstream="build-tools-release" />
+  <project name="platform/external/toybox" path="external/toybox" revision="50393b4549f7f279dc6d0ddfcc7bda17166e2c71" upstream="build-tools-release" />
 
   <project name="platform/external/turbine" path="external/turbine" revision="0def9c449f3e2458b218b3237c2692eab0ce35d8" upstream="build-tools-release" />
 
-  <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="97364dc52431b418722a9e5bc97ec133ff28fbd7" upstream="build-tools-release" />
+  <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="62372649d2e73019abb4d831f43755f81fd01911" upstream="build-tools-release" />
 
   <project name="platform/system/tools/hidl" path="system/tools/hidl" revision="c5a34e4d804ef2e84d757bd3e2c3ff38639756b0" upstream="build-tools-release" />
 
diff --git a/sysroots/i686-linux-musl/lib/Scrt1-real.o b/sysroots/i686-linux-musl/lib/Scrt1-real.o
new file mode 100644
index 0000000..02117b7
--- /dev/null
+++ b/sysroots/i686-linux-musl/lib/Scrt1-real.o
Binary files differ
diff --git a/sysroots/i686-linux-musl/lib/Scrt1.o b/sysroots/i686-linux-musl/lib/Scrt1.o
index 7d5f564..244e290 100644
--- a/sysroots/i686-linux-musl/lib/Scrt1.o
+++ b/sysroots/i686-linux-musl/lib/Scrt1.o
Binary files differ
diff --git a/sysroots/i686-linux-musl/lib/crt1.o b/sysroots/i686-linux-musl/lib/crt1.o
index 929273e..5046323 100644
--- a/sysroots/i686-linux-musl/lib/crt1.o
+++ b/sysroots/i686-linux-musl/lib/crt1.o
Binary files differ
diff --git a/sysroots/i686-linux-musl/lib/crti.o b/sysroots/i686-linux-musl/lib/crti.o
index 5e0fd42..f0331d1 100644
--- a/sysroots/i686-linux-musl/lib/crti.o
+++ b/sysroots/i686-linux-musl/lib/crti.o
Binary files differ
diff --git a/sysroots/i686-linux-musl/lib/crtn.o b/sysroots/i686-linux-musl/lib/crtn.o
index 6cab432..93409d7 100644
--- a/sysroots/i686-linux-musl/lib/crtn.o
+++ b/sysroots/i686-linux-musl/lib/crtn.o
Binary files differ
diff --git a/sysroots/i686-linux-musl/lib/ld-musl.so.1 b/sysroots/i686-linux-musl/lib/ld-musl.so.1
deleted file mode 100755
index 9b2aa9e..0000000
--- a/sysroots/i686-linux-musl/lib/ld-musl.so.1
+++ /dev/null
Binary files differ
diff --git a/sysroots/i686-linux-musl/lib/ld-musl.so.1 b/sysroots/i686-linux-musl/lib/ld-musl.so.1
new file mode 120000
index 0000000..a37fda9
--- /dev/null
+++ b/sysroots/i686-linux-musl/lib/ld-musl.so.1
@@ -0,0 +1 @@
+libc_musl.so
\ No newline at end of file
diff --git a/sysroots/i686-linux-musl/lib/libc.a b/sysroots/i686-linux-musl/lib/libc.a
index 6854783..918cd26 100644
--- a/sysroots/i686-linux-musl/lib/libc.a
+++ b/sysroots/i686-linux-musl/lib/libc.a
Binary files differ
diff --git a/sysroots/i686-linux-musl/lib/libc.so b/sysroots/i686-linux-musl/lib/libc.so
old mode 100755
new mode 100644
index 9b2aa9e..8de62cf
--- a/sysroots/i686-linux-musl/lib/libc.so
+++ b/sysroots/i686-linux-musl/lib/libc.so
Binary files differ
diff --git a/sysroots/i686-linux-musl/lib/libc_musl.so b/sysroots/i686-linux-musl/lib/libc_musl.so
index 26ca2fa..8d8677d 100755
--- a/sysroots/i686-linux-musl/lib/libc_musl.so
+++ b/sysroots/i686-linux-musl/lib/libc_musl.so
Binary files differ
diff --git a/sysroots/i686-linux-musl/lib/libc_musl_crtbegin_so.o b/sysroots/i686-linux-musl/lib/libc_musl_crtbegin_so.o
deleted file mode 100644
index fc24222..0000000
--- a/sysroots/i686-linux-musl/lib/libc_musl_crtbegin_so.o
+++ /dev/null
Binary files differ
diff --git a/sysroots/i686-linux-musl/lib/libc_musl_crtbegin_static.o b/sysroots/i686-linux-musl/lib/libc_musl_crtbegin_static.o
deleted file mode 100644
index 44e4642..0000000
--- a/sysroots/i686-linux-musl/lib/libc_musl_crtbegin_static.o
+++ /dev/null
Binary files differ
diff --git a/sysroots/i686-linux-musl/lib/libc_musl_crtend.o b/sysroots/i686-linux-musl/lib/libc_musl_crtend.o
deleted file mode 100644
index 873c6c4..0000000
--- a/sysroots/i686-linux-musl/lib/libc_musl_crtend.o
+++ /dev/null
Binary files differ
diff --git a/sysroots/i686-linux-musl/lib/libc_musl_crtbegin_dynamic.o b/sysroots/i686-linux-musl/lib/libc_musl_linker_object.o
similarity index 61%
rename from sysroots/i686-linux-musl/lib/libc_musl_crtbegin_dynamic.o
rename to sysroots/i686-linux-musl/lib/libc_musl_linker_object.o
index 93d814e..d985b70 100644
--- a/sysroots/i686-linux-musl/lib/libc_musl_crtbegin_dynamic.o
+++ b/sysroots/i686-linux-musl/lib/libc_musl_linker_object.o
Binary files differ
diff --git a/sysroots/i686-linux-musl/lib/linker.script b/sysroots/i686-linux-musl/lib/linker.script
index 3be966a..c5e47af 100755
--- a/sysroots/i686-linux-musl/lib/linker.script
+++ b/sysroots/i686-linux-musl/lib/linker.script
@@ -3,13 +3,13 @@
   .linker_r 0x1000 : {
     KEEP(*(.linker_r));
   }
-  .linker_rx 0x486e0 : {
+  .linker_rx 0x48aa0 : {
     KEEP(*(.linker_rx));
   }
-  .linker_rw 0x124010 : {
+  .linker_rw 0x124450 : {
     KEEP(*(.linker_rw));
   }
-  .linker_rw2 0x125470 : {
+  .linker_rw2 0x1258b0 : {
     KEEP(*(.linker_rw2));
   }
 }
diff --git a/sysroots/i686-linux-musl/lib/rcrt1.o b/sysroots/i686-linux-musl/lib/rcrt1.o
index 48d9407..17effd6 100644
--- a/sysroots/i686-linux-musl/lib/rcrt1.o
+++ b/sysroots/i686-linux-musl/lib/rcrt1.o
Binary files differ
diff --git a/sysroots/x86_64-linux-musl/lib/Scrt1-real.o b/sysroots/x86_64-linux-musl/lib/Scrt1-real.o
new file mode 100644
index 0000000..cf7ce01
--- /dev/null
+++ b/sysroots/x86_64-linux-musl/lib/Scrt1-real.o
Binary files differ
diff --git a/sysroots/x86_64-linux-musl/lib/Scrt1.o b/sysroots/x86_64-linux-musl/lib/Scrt1.o
index 34c3323..244e290 100644
--- a/sysroots/x86_64-linux-musl/lib/Scrt1.o
+++ b/sysroots/x86_64-linux-musl/lib/Scrt1.o
Binary files differ
diff --git a/sysroots/x86_64-linux-musl/lib/crt1.o b/sysroots/x86_64-linux-musl/lib/crt1.o
index ca2bf9d..3b379f1 100644
--- a/sysroots/x86_64-linux-musl/lib/crt1.o
+++ b/sysroots/x86_64-linux-musl/lib/crt1.o
Binary files differ
diff --git a/sysroots/x86_64-linux-musl/lib/crti.o b/sysroots/x86_64-linux-musl/lib/crti.o
index 8765452..67789f8 100644
--- a/sysroots/x86_64-linux-musl/lib/crti.o
+++ b/sysroots/x86_64-linux-musl/lib/crti.o
Binary files differ
diff --git a/sysroots/x86_64-linux-musl/lib/crtn.o b/sysroots/x86_64-linux-musl/lib/crtn.o
index 7b5a01b..ea7ca02 100644
--- a/sysroots/x86_64-linux-musl/lib/crtn.o
+++ b/sysroots/x86_64-linux-musl/lib/crtn.o
Binary files differ
diff --git a/sysroots/x86_64-linux-musl/lib/ld-musl.so.1 b/sysroots/x86_64-linux-musl/lib/ld-musl.so.1
deleted file mode 100755
index 1e5539f..0000000
--- a/sysroots/x86_64-linux-musl/lib/ld-musl.so.1
+++ /dev/null
Binary files differ
diff --git a/sysroots/x86_64-linux-musl/lib/ld-musl.so.1 b/sysroots/x86_64-linux-musl/lib/ld-musl.so.1
new file mode 120000
index 0000000..a37fda9
--- /dev/null
+++ b/sysroots/x86_64-linux-musl/lib/ld-musl.so.1
@@ -0,0 +1 @@
+libc_musl.so
\ No newline at end of file
diff --git a/sysroots/x86_64-linux-musl/lib/libc.a b/sysroots/x86_64-linux-musl/lib/libc.a
index 715b95f..d9ed304 100644
--- a/sysroots/x86_64-linux-musl/lib/libc.a
+++ b/sysroots/x86_64-linux-musl/lib/libc.a
Binary files differ
diff --git a/sysroots/x86_64-linux-musl/lib/libc.so b/sysroots/x86_64-linux-musl/lib/libc.so
old mode 100755
new mode 100644
index 1e5539f..8de62cf
--- a/sysroots/x86_64-linux-musl/lib/libc.so
+++ b/sysroots/x86_64-linux-musl/lib/libc.so
Binary files differ
diff --git a/sysroots/x86_64-linux-musl/lib/libc_musl.so b/sysroots/x86_64-linux-musl/lib/libc_musl.so
index 0ec563d..3dee389 100755
--- a/sysroots/x86_64-linux-musl/lib/libc_musl.so
+++ b/sysroots/x86_64-linux-musl/lib/libc_musl.so
Binary files differ
diff --git a/sysroots/x86_64-linux-musl/lib/libc_musl_crtbegin_so.o b/sysroots/x86_64-linux-musl/lib/libc_musl_crtbegin_so.o
deleted file mode 100644
index 804a179..0000000
--- a/sysroots/x86_64-linux-musl/lib/libc_musl_crtbegin_so.o
+++ /dev/null
Binary files differ
diff --git a/sysroots/x86_64-linux-musl/lib/libc_musl_crtbegin_static.o b/sysroots/x86_64-linux-musl/lib/libc_musl_crtbegin_static.o
deleted file mode 100644
index 633f0c0..0000000
--- a/sysroots/x86_64-linux-musl/lib/libc_musl_crtbegin_static.o
+++ /dev/null
Binary files differ
diff --git a/sysroots/x86_64-linux-musl/lib/libc_musl_crtend.o b/sysroots/x86_64-linux-musl/lib/libc_musl_crtend.o
deleted file mode 100644
index 963a248..0000000
--- a/sysroots/x86_64-linux-musl/lib/libc_musl_crtend.o
+++ /dev/null
Binary files differ
diff --git a/sysroots/x86_64-linux-musl/lib/libc_musl_crtbegin_dynamic.o b/sysroots/x86_64-linux-musl/lib/libc_musl_linker_object.o
similarity index 64%
rename from sysroots/x86_64-linux-musl/lib/libc_musl_crtbegin_dynamic.o
rename to sysroots/x86_64-linux-musl/lib/libc_musl_linker_object.o
index 655e10f..e318685 100644
--- a/sysroots/x86_64-linux-musl/lib/libc_musl_crtbegin_dynamic.o
+++ b/sysroots/x86_64-linux-musl/lib/libc_musl_linker_object.o
Binary files differ
diff --git a/sysroots/x86_64-linux-musl/lib/linker.script b/sysroots/x86_64-linux-musl/lib/linker.script
index ef7844c..06351f4 100755
--- a/sysroots/x86_64-linux-musl/lib/linker.script
+++ b/sysroots/x86_64-linux-musl/lib/linker.script
@@ -3,13 +3,13 @@
   .linker_r 0x1000 : {
     KEEP(*(.linker_r));
   }
-  .linker_rx 0x4deb4 : {
+  .linker_rx 0x4dec4 : {
     KEEP(*(.linker_rx));
   }
-  .linker_rw 0x116e00 : {
+  .linker_rw 0x116e30 : {
     KEEP(*(.linker_rw));
   }
-  .linker_rw2 0x1184d0 : {
+  .linker_rw2 0x118500 : {
     KEEP(*(.linker_rw2));
   }
 }
diff --git a/sysroots/x86_64-linux-musl/lib/rcrt1.o b/sysroots/x86_64-linux-musl/lib/rcrt1.o
index af90848..f2e4939 100644
--- a/sysroots/x86_64-linux-musl/lib/rcrt1.o
+++ b/sysroots/x86_64-linux-musl/lib/rcrt1.o
Binary files differ