diff --git a/android-arm/gdbserver/gdbserver b/android-arm/gdbserver/gdbserver
index 2c86ca3..1ca828b 100755
--- a/android-arm/gdbserver/gdbserver
+++ b/android-arm/gdbserver/gdbserver
Binary files differ
diff --git a/android-arm/gdbserver/manifest_2274331.xml b/android-arm/gdbserver/manifest_2274331.xml
deleted file mode 100644
index cadf2cf..0000000
--- a/android-arm/gdbserver/manifest_2274331.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/"/>
-  
-  <default remote="aosp" revision="master" sync-j="4"/>
-  
-  <project groups="pdk" name="platform/bionic" path="bionic" revision="8d92afe32265be8c36ea2adb3c4059298cd583eb" upstream="master"/>
-  <project groups="pdk-cw-fs" name="platform/development" path="development" revision="54212f988146578dd014c42a8b1e66e98ab740e7" upstream="master"/>
-  <project name="platform/external/chromite" path="chromite" revision="f9a912f6cfbc0c8e9419cafb0c7b1698926dce5f" upstream="master"/>
-  <project name="platform/ndk" path="ndk" revision="d635836b69953d91568a686f5613b1787dc3e1bd" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/clang/darwin-x86/host/3.6" path="prebuilts/clang/darwin-x86/host/3.6" revision="2f82e647995de18b47411091197d47714a502015" upstream="master"/>
-  <project name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/windows-x86/host/3.6" revision="f815c2be35252a78d3c0f4aed41630827f41e71d" upstream="master"/>
-  <project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.6" path="prebuilts/clang/linux-x86/host/3.6" revision="ac7be37a7a0cabeb34c335bf5d8882afcba4efa0" upstream="master"/>
-  <project groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="e821c649f37f3aafa2f84e919bdf006a163b1b76" upstream="master"/>
-  <project groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" revision="6d08ca9f45ff685648fd13c75bf5cac4b11c19bb" upstream="master"/>
-  <project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="83189309ee02314ad9e7147b96c6a893e5cf1ca0" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="8834958755acc291d126ba7ee38ac731d04f9c9e" upstream="master"/>
-  <project groups="pdk,darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" revision="aa65de04f78c9c87805be00666ae0c6bbe0ebfb6" upstream="master"/>
-  <project groups="pdk,darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="c0371efb25365f44e0ad4ea61a74d6e4fb84f3ce" upstream="master"/>
-  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="94cc9234bb6adef9d701819180a3c2db8360ea31" upstream="master"/>
-  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="26e93f6af47f7bd3a9beb5c102a5f45e19bfa38a" upstream="master"/>
-  <project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="a70724fae4d4c571e5657340f80a0c130d5283ec" upstream="master"/>
-  <project groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="63b209feac0b045f5fc68810fd2e65bf1ca51e2f" upstream="master"/>
-  <project 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="f61a459478cdc31e8aae22a182cdbf814ba08012" upstream="master"/>
-  <project 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="f691cae2f256d5f72388c0ce9113007a53ad333a" upstream="master"/>
-  <project groups="pdk,linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" revision="59461df1418b3771c11f1957bb8f7f41e399447d" upstream="master"/>
-  <project groups="pdk,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="c1a39ddef8496eb84c49883423a220e7dfe80d06" upstream="master"/>
-  <project groups="pdk" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="494e98c2aca71476d9f9383c1205a7172dddd343" upstream="dev"/>
-  <project groups="darwin,pdk,pdk-cw-fs" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="dacf2de576516f2751420eb60b8daf64d0f91677" upstream="master"/>
-  <project groups="linux,pdk,pdk-cw-fs" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="583652f1b6e213ea1763099736dabc8070798d47" upstream="master"/>
-  <project name="toolchain/binutils" revision="042c220bc2d2c48ecf410b0dfffb388a5d57cccc" upstream="master"/>
-  <project name="toolchain/build" revision="79b5701f1e2f0dee68958c7c4206cdf9c44f1261" upstream="master"/>
-  <project name="toolchain/cloog" revision="604793eab97d360aef729f064674569ee6dbf3e1" upstream="master"/>
-  <project name="toolchain/expat" revision="40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5" upstream="master"/>
-  <project name="toolchain/gcc" revision="81762471dff662de3066037f425d4dadc20be40f" upstream="master"/>
-  <project name="toolchain/gdb" revision="c9f9f54d36124448cf18d57923ec801ca84478b5" upstream="master"/>
-  <project name="toolchain/gmp" revision="b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810" upstream="master"/>
-  <project name="toolchain/isl" revision="b05d4572958c5d497da793f3317084bab90c3033" upstream="master"/>
-  <project name="toolchain/mpc" revision="835d16e92eed875638a8b5d552034c3b1aae045b" upstream="master"/>
-  <project name="toolchain/mpfr" revision="de979fc377db766591e7feaf052f0de59be46e76" upstream="master"/>
-  <project name="toolchain/ndk_chromite_config" path="chromite/config" revision="aaf0bc7c5c33aa92f2b796537cea44309f514e09" upstream="master"/>
-  <project name="toolchain/ppl" revision="979062d362bc5a1c00804237b408b19b4618fb24" upstream="master"/>
-  <project name="toolchain/python" revision="5d4afafe362cfabf6c4783a11c4c80df5afa1e1f" upstream="master"/>
-  <project name="toolchain/sed" revision="45df23d6dc8b51ea5cd903d023c10fd7d72415b9" upstream="master"/>
-  <project name="toolchain/yasm" revision="c78ebe9a44cf69c46fd4e3185fef62e567b5ad4a" upstream="master"/>
-</manifest>
diff --git a/android-arm/gdbserver/manifest_2824841.xml b/android-arm/gdbserver/manifest_2824841.xml
new file mode 100644
index 0000000..a633f26
--- /dev/null
+++ b/android-arm/gdbserver/manifest_2824841.xml
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<manifest>
+  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
+  <default remote="aosp" revision="master" sync-j="4" />
+  <project groups="presubmit" name="platform/bionic" path="bionic" revision="e23df93915dd89ae9661dded3c51bfd5a0bd185e" upstream="master" />
+  <project groups="presubmit" name="platform/development" path="development" revision="6980f5dc5e877fe993868473ffda6111deb06954" upstream="master" />
+  <project groups="presubmit" name="platform/external/googletest" path="external/googletest" revision="013ee6fccb6bb9ebd6215b504f0eef45dccfde4e" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/glslang" path="external/shaderc/glslang" revision="c1ccd4bf91d665a19c7ed2694fe65bf1738a6845" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/shaderc" path="external/shaderc/shaderc" revision="08f8e49598711f107422b6027c26d6957a241e1d" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/spirv-tools" path="external/shaderc/spirv-tools" revision="ed0b8866c47b26c9fe2a728b73392f6baefa2158" upstream="master" />
+  <project groups="presubmit" name="platform/external/vulkan-validation-layers" path="external/vulkan-validation-layers" revision="6130dca5798afb9e08e2b7e532aef5d2ebd4d706" upstream="master" />
+  <project groups="presubmit" name="platform/ndk" path="ndk" revision="92748458b72f89e3d8f9c431ccb615bec8e20c26" upstream="master" />
+  <project name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="33f0063128e4d6ab7f63782c9cd32db4e832848d" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="77a403cdd725a3ba75a4d86d777cc1b2343eba1a" upstream="master" />
+  <project name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="97ebdaddae61ce3a666e8a9a620fc3cc9828bb85" upstream="master" />
+  <project name="platform/prebuilts/cmake/darwin-x86" path="prebuilts/cmake/darwin-x86" revision="d4410da1ac307f4c8362a2b0ae727c682ae06ed4" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/cmake/linux-x86" path="prebuilts/cmake/linux-x86" revision="091caafda44f7fe52a94387b2eafcf204ea909d3" upstream="master" />
+  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="51fa77f10f8c5ee658bfaf3e5a2a29ebd8de50d2" upstream="master" />
+  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" revision="6d08ca9f45ff685648fd13c75bf5cac4b11c19bb" upstream="master" />
+  <project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="39fd9577fe3895a68a921216836ebdd46b4255a8" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e" upstream="master" />
+  <project groups="darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" revision="4ba48d4ace63404304f201dc7d5e87ac55fc7d59" upstream="master" />
+  <project groups="darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="2500bd9aaa640c179730df7f7315d5ee90e4c3c1" upstream="master" />
+  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="423c0265176bcabd1c885f8cf6f0cedf67d3f59b" upstream="master" />
+  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="26e93f6af47f7bd3a9beb5c102a5f45e19bfa38a" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="887574f98e97475d6fb2f91a8f7b24602466017a" upstream="master" />
+  <project groups="presubmit,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="1273431a189717842f033573eb8c777e13dd88b7" upstream="master" />
+  <project groups="presubmit" 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="73ca99196723f810dad42390d154654354f57c16" upstream="master" />
+  <project groups="presubmit" 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="c795eed743bc6cee4ead5407cc237c43abf6fa26" upstream="master" />
+  <project groups="presubmit,linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" revision="88bfecab5b700a1f6a601434d5816fab6c9261fc" upstream="master" />
+  <project groups="presubmit,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="e3b93a8f44d43101b396d41ef30562885714e130" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="0677c905795eac2b69980105c44514df813aed23" upstream="dev" />
+  <project name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="cc147ae2956e96279085abfadda2767b50edc2cc" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="543112c6744acb7a018ac36118eb2a862834809b" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="0c5958b1636c47ed7c284f859c8e805fd06a0e63" upstream="master" />
+  <project groups="linux,presubmit" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="9870834a1f61689aaff1eedda0e1ee73d7150763" upstream="master" />
+  <project groups="presubmit" name="toolchain/binutils" path="toolchain/binutils" revision="d929cfd50d770364fd652d252abc19598b0cc84c" upstream="master" />
+  <project groups="presubmit" name="toolchain/build" path="toolchain/build" revision="f280657461aee54b6d2807881d8a77832f4e794c" upstream="master" />
+  <project groups="presubmit" name="toolchain/cloog" path="toolchain/cloog" revision="604793eab97d360aef729f064674569ee6dbf3e1" upstream="master" />
+  <project groups="presubmit" name="toolchain/expat" path="toolchain/expat" revision="40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5" upstream="master" />
+  <project groups="presubmit" name="toolchain/gcc" path="toolchain/gcc" revision="3791dafeb2d58bc6c45753f4cdf0fa5431963cfa" upstream="master" />
+  <project groups="presubmit" name="toolchain/gdb" path="toolchain/gdb" revision="abe5c08aee8f2602c40a951dae64daac4beb597a" upstream="master" />
+  <project groups="presubmit" name="toolchain/gmp" path="toolchain/gmp" revision="b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810" upstream="master" />
+  <project groups="presubmit" name="toolchain/isl" path="toolchain/isl" revision="0ccf95726af8ce58ad61ff474addbce3a31ba99c" upstream="master" />
+  <project groups="presubmit" name="toolchain/mpc" path="toolchain/mpc" revision="835d16e92eed875638a8b5d552034c3b1aae045b" upstream="master" />
+  <project groups="presubmit" name="toolchain/mpfr" path="toolchain/mpfr" revision="de979fc377db766591e7feaf052f0de59be46e76" upstream="master" />
+  <project groups="presubmit" name="toolchain/ppl" path="toolchain/ppl" revision="979062d362bc5a1c00804237b408b19b4618fb24" upstream="master" />
+  <project groups="presubmit" name="toolchain/python" path="toolchain/python" revision="6a7fc9bfd21da85dda97a8bcd2952e0bfbded424" upstream="master" />
+  <project groups="presubmit" name="toolchain/sed" path="toolchain/sed" revision="45df23d6dc8b51ea5cd903d023c10fd7d72415b9" upstream="master" />
+  <project groups="presubmit" name="toolchain/xz" path="toolchain/xz" revision="595407f5a237e9bfd6821d70096d38825ec9c4e0" upstream="master" />
+  <project groups="presubmit" name="toolchain/yasm" path="toolchain/yasm" revision="a159fe073809b4138cf90b7298ea31ea17af85c0" upstream="master" />
+</manifest>
diff --git a/android-arm64/gdbserver64/gdbserver64 b/android-arm64/gdbserver64/gdbserver64
index ec04e0c..54f6263 100755
--- a/android-arm64/gdbserver64/gdbserver64
+++ b/android-arm64/gdbserver64/gdbserver64
Binary files differ
diff --git a/android-arm64/gdbserver64/manifest_2274331.xml b/android-arm64/gdbserver64/manifest_2274331.xml
deleted file mode 100644
index cadf2cf..0000000
--- a/android-arm64/gdbserver64/manifest_2274331.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/"/>
-  
-  <default remote="aosp" revision="master" sync-j="4"/>
-  
-  <project groups="pdk" name="platform/bionic" path="bionic" revision="8d92afe32265be8c36ea2adb3c4059298cd583eb" upstream="master"/>
-  <project groups="pdk-cw-fs" name="platform/development" path="development" revision="54212f988146578dd014c42a8b1e66e98ab740e7" upstream="master"/>
-  <project name="platform/external/chromite" path="chromite" revision="f9a912f6cfbc0c8e9419cafb0c7b1698926dce5f" upstream="master"/>
-  <project name="platform/ndk" path="ndk" revision="d635836b69953d91568a686f5613b1787dc3e1bd" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/clang/darwin-x86/host/3.6" path="prebuilts/clang/darwin-x86/host/3.6" revision="2f82e647995de18b47411091197d47714a502015" upstream="master"/>
-  <project name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/windows-x86/host/3.6" revision="f815c2be35252a78d3c0f4aed41630827f41e71d" upstream="master"/>
-  <project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.6" path="prebuilts/clang/linux-x86/host/3.6" revision="ac7be37a7a0cabeb34c335bf5d8882afcba4efa0" upstream="master"/>
-  <project groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="e821c649f37f3aafa2f84e919bdf006a163b1b76" upstream="master"/>
-  <project groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" revision="6d08ca9f45ff685648fd13c75bf5cac4b11c19bb" upstream="master"/>
-  <project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="83189309ee02314ad9e7147b96c6a893e5cf1ca0" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="8834958755acc291d126ba7ee38ac731d04f9c9e" upstream="master"/>
-  <project groups="pdk,darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" revision="aa65de04f78c9c87805be00666ae0c6bbe0ebfb6" upstream="master"/>
-  <project groups="pdk,darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="c0371efb25365f44e0ad4ea61a74d6e4fb84f3ce" upstream="master"/>
-  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="94cc9234bb6adef9d701819180a3c2db8360ea31" upstream="master"/>
-  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="26e93f6af47f7bd3a9beb5c102a5f45e19bfa38a" upstream="master"/>
-  <project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="a70724fae4d4c571e5657340f80a0c130d5283ec" upstream="master"/>
-  <project groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="63b209feac0b045f5fc68810fd2e65bf1ca51e2f" upstream="master"/>
-  <project 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="f61a459478cdc31e8aae22a182cdbf814ba08012" upstream="master"/>
-  <project 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="f691cae2f256d5f72388c0ce9113007a53ad333a" upstream="master"/>
-  <project groups="pdk,linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" revision="59461df1418b3771c11f1957bb8f7f41e399447d" upstream="master"/>
-  <project groups="pdk,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="c1a39ddef8496eb84c49883423a220e7dfe80d06" upstream="master"/>
-  <project groups="pdk" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="494e98c2aca71476d9f9383c1205a7172dddd343" upstream="dev"/>
-  <project groups="darwin,pdk,pdk-cw-fs" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="dacf2de576516f2751420eb60b8daf64d0f91677" upstream="master"/>
-  <project groups="linux,pdk,pdk-cw-fs" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="583652f1b6e213ea1763099736dabc8070798d47" upstream="master"/>
-  <project name="toolchain/binutils" revision="042c220bc2d2c48ecf410b0dfffb388a5d57cccc" upstream="master"/>
-  <project name="toolchain/build" revision="79b5701f1e2f0dee68958c7c4206cdf9c44f1261" upstream="master"/>
-  <project name="toolchain/cloog" revision="604793eab97d360aef729f064674569ee6dbf3e1" upstream="master"/>
-  <project name="toolchain/expat" revision="40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5" upstream="master"/>
-  <project name="toolchain/gcc" revision="81762471dff662de3066037f425d4dadc20be40f" upstream="master"/>
-  <project name="toolchain/gdb" revision="c9f9f54d36124448cf18d57923ec801ca84478b5" upstream="master"/>
-  <project name="toolchain/gmp" revision="b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810" upstream="master"/>
-  <project name="toolchain/isl" revision="b05d4572958c5d497da793f3317084bab90c3033" upstream="master"/>
-  <project name="toolchain/mpc" revision="835d16e92eed875638a8b5d552034c3b1aae045b" upstream="master"/>
-  <project name="toolchain/mpfr" revision="de979fc377db766591e7feaf052f0de59be46e76" upstream="master"/>
-  <project name="toolchain/ndk_chromite_config" path="chromite/config" revision="aaf0bc7c5c33aa92f2b796537cea44309f514e09" upstream="master"/>
-  <project name="toolchain/ppl" revision="979062d362bc5a1c00804237b408b19b4618fb24" upstream="master"/>
-  <project name="toolchain/python" revision="5d4afafe362cfabf6c4783a11c4c80df5afa1e1f" upstream="master"/>
-  <project name="toolchain/sed" revision="45df23d6dc8b51ea5cd903d023c10fd7d72415b9" upstream="master"/>
-  <project name="toolchain/yasm" revision="c78ebe9a44cf69c46fd4e3185fef62e567b5ad4a" upstream="master"/>
-</manifest>
diff --git a/android-arm64/gdbserver64/manifest_2824841.xml b/android-arm64/gdbserver64/manifest_2824841.xml
new file mode 100644
index 0000000..a633f26
--- /dev/null
+++ b/android-arm64/gdbserver64/manifest_2824841.xml
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<manifest>
+  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
+  <default remote="aosp" revision="master" sync-j="4" />
+  <project groups="presubmit" name="platform/bionic" path="bionic" revision="e23df93915dd89ae9661dded3c51bfd5a0bd185e" upstream="master" />
+  <project groups="presubmit" name="platform/development" path="development" revision="6980f5dc5e877fe993868473ffda6111deb06954" upstream="master" />
+  <project groups="presubmit" name="platform/external/googletest" path="external/googletest" revision="013ee6fccb6bb9ebd6215b504f0eef45dccfde4e" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/glslang" path="external/shaderc/glslang" revision="c1ccd4bf91d665a19c7ed2694fe65bf1738a6845" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/shaderc" path="external/shaderc/shaderc" revision="08f8e49598711f107422b6027c26d6957a241e1d" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/spirv-tools" path="external/shaderc/spirv-tools" revision="ed0b8866c47b26c9fe2a728b73392f6baefa2158" upstream="master" />
+  <project groups="presubmit" name="platform/external/vulkan-validation-layers" path="external/vulkan-validation-layers" revision="6130dca5798afb9e08e2b7e532aef5d2ebd4d706" upstream="master" />
+  <project groups="presubmit" name="platform/ndk" path="ndk" revision="92748458b72f89e3d8f9c431ccb615bec8e20c26" upstream="master" />
+  <project name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="33f0063128e4d6ab7f63782c9cd32db4e832848d" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="77a403cdd725a3ba75a4d86d777cc1b2343eba1a" upstream="master" />
+  <project name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="97ebdaddae61ce3a666e8a9a620fc3cc9828bb85" upstream="master" />
+  <project name="platform/prebuilts/cmake/darwin-x86" path="prebuilts/cmake/darwin-x86" revision="d4410da1ac307f4c8362a2b0ae727c682ae06ed4" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/cmake/linux-x86" path="prebuilts/cmake/linux-x86" revision="091caafda44f7fe52a94387b2eafcf204ea909d3" upstream="master" />
+  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="51fa77f10f8c5ee658bfaf3e5a2a29ebd8de50d2" upstream="master" />
+  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" revision="6d08ca9f45ff685648fd13c75bf5cac4b11c19bb" upstream="master" />
+  <project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="39fd9577fe3895a68a921216836ebdd46b4255a8" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e" upstream="master" />
+  <project groups="darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" revision="4ba48d4ace63404304f201dc7d5e87ac55fc7d59" upstream="master" />
+  <project groups="darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="2500bd9aaa640c179730df7f7315d5ee90e4c3c1" upstream="master" />
+  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="423c0265176bcabd1c885f8cf6f0cedf67d3f59b" upstream="master" />
+  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="26e93f6af47f7bd3a9beb5c102a5f45e19bfa38a" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="887574f98e97475d6fb2f91a8f7b24602466017a" upstream="master" />
+  <project groups="presubmit,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="1273431a189717842f033573eb8c777e13dd88b7" upstream="master" />
+  <project groups="presubmit" 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="73ca99196723f810dad42390d154654354f57c16" upstream="master" />
+  <project groups="presubmit" 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="c795eed743bc6cee4ead5407cc237c43abf6fa26" upstream="master" />
+  <project groups="presubmit,linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" revision="88bfecab5b700a1f6a601434d5816fab6c9261fc" upstream="master" />
+  <project groups="presubmit,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="e3b93a8f44d43101b396d41ef30562885714e130" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="0677c905795eac2b69980105c44514df813aed23" upstream="dev" />
+  <project name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="cc147ae2956e96279085abfadda2767b50edc2cc" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="543112c6744acb7a018ac36118eb2a862834809b" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="0c5958b1636c47ed7c284f859c8e805fd06a0e63" upstream="master" />
+  <project groups="linux,presubmit" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="9870834a1f61689aaff1eedda0e1ee73d7150763" upstream="master" />
+  <project groups="presubmit" name="toolchain/binutils" path="toolchain/binutils" revision="d929cfd50d770364fd652d252abc19598b0cc84c" upstream="master" />
+  <project groups="presubmit" name="toolchain/build" path="toolchain/build" revision="f280657461aee54b6d2807881d8a77832f4e794c" upstream="master" />
+  <project groups="presubmit" name="toolchain/cloog" path="toolchain/cloog" revision="604793eab97d360aef729f064674569ee6dbf3e1" upstream="master" />
+  <project groups="presubmit" name="toolchain/expat" path="toolchain/expat" revision="40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5" upstream="master" />
+  <project groups="presubmit" name="toolchain/gcc" path="toolchain/gcc" revision="3791dafeb2d58bc6c45753f4cdf0fa5431963cfa" upstream="master" />
+  <project groups="presubmit" name="toolchain/gdb" path="toolchain/gdb" revision="abe5c08aee8f2602c40a951dae64daac4beb597a" upstream="master" />
+  <project groups="presubmit" name="toolchain/gmp" path="toolchain/gmp" revision="b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810" upstream="master" />
+  <project groups="presubmit" name="toolchain/isl" path="toolchain/isl" revision="0ccf95726af8ce58ad61ff474addbce3a31ba99c" upstream="master" />
+  <project groups="presubmit" name="toolchain/mpc" path="toolchain/mpc" revision="835d16e92eed875638a8b5d552034c3b1aae045b" upstream="master" />
+  <project groups="presubmit" name="toolchain/mpfr" path="toolchain/mpfr" revision="de979fc377db766591e7feaf052f0de59be46e76" upstream="master" />
+  <project groups="presubmit" name="toolchain/ppl" path="toolchain/ppl" revision="979062d362bc5a1c00804237b408b19b4618fb24" upstream="master" />
+  <project groups="presubmit" name="toolchain/python" path="toolchain/python" revision="6a7fc9bfd21da85dda97a8bcd2952e0bfbded424" upstream="master" />
+  <project groups="presubmit" name="toolchain/sed" path="toolchain/sed" revision="45df23d6dc8b51ea5cd903d023c10fd7d72415b9" upstream="master" />
+  <project groups="presubmit" name="toolchain/xz" path="toolchain/xz" revision="595407f5a237e9bfd6821d70096d38825ec9c4e0" upstream="master" />
+  <project groups="presubmit" name="toolchain/yasm" path="toolchain/yasm" revision="a159fe073809b4138cf90b7298ea31ea17af85c0" upstream="master" />
+</manifest>
diff --git a/android-mips/gdbserver/gdbserver b/android-mips/gdbserver/gdbserver
index db806e2..00fd8ad 100755
--- a/android-mips/gdbserver/gdbserver
+++ b/android-mips/gdbserver/gdbserver
Binary files differ
diff --git a/android-mips/gdbserver/manifest_2274331.xml b/android-mips/gdbserver/manifest_2274331.xml
deleted file mode 100644
index cadf2cf..0000000
--- a/android-mips/gdbserver/manifest_2274331.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/"/>
-  
-  <default remote="aosp" revision="master" sync-j="4"/>
-  
-  <project groups="pdk" name="platform/bionic" path="bionic" revision="8d92afe32265be8c36ea2adb3c4059298cd583eb" upstream="master"/>
-  <project groups="pdk-cw-fs" name="platform/development" path="development" revision="54212f988146578dd014c42a8b1e66e98ab740e7" upstream="master"/>
-  <project name="platform/external/chromite" path="chromite" revision="f9a912f6cfbc0c8e9419cafb0c7b1698926dce5f" upstream="master"/>
-  <project name="platform/ndk" path="ndk" revision="d635836b69953d91568a686f5613b1787dc3e1bd" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/clang/darwin-x86/host/3.6" path="prebuilts/clang/darwin-x86/host/3.6" revision="2f82e647995de18b47411091197d47714a502015" upstream="master"/>
-  <project name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/windows-x86/host/3.6" revision="f815c2be35252a78d3c0f4aed41630827f41e71d" upstream="master"/>
-  <project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.6" path="prebuilts/clang/linux-x86/host/3.6" revision="ac7be37a7a0cabeb34c335bf5d8882afcba4efa0" upstream="master"/>
-  <project groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="e821c649f37f3aafa2f84e919bdf006a163b1b76" upstream="master"/>
-  <project groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" revision="6d08ca9f45ff685648fd13c75bf5cac4b11c19bb" upstream="master"/>
-  <project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="83189309ee02314ad9e7147b96c6a893e5cf1ca0" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="8834958755acc291d126ba7ee38ac731d04f9c9e" upstream="master"/>
-  <project groups="pdk,darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" revision="aa65de04f78c9c87805be00666ae0c6bbe0ebfb6" upstream="master"/>
-  <project groups="pdk,darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="c0371efb25365f44e0ad4ea61a74d6e4fb84f3ce" upstream="master"/>
-  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="94cc9234bb6adef9d701819180a3c2db8360ea31" upstream="master"/>
-  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="26e93f6af47f7bd3a9beb5c102a5f45e19bfa38a" upstream="master"/>
-  <project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="a70724fae4d4c571e5657340f80a0c130d5283ec" upstream="master"/>
-  <project groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="63b209feac0b045f5fc68810fd2e65bf1ca51e2f" upstream="master"/>
-  <project 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="f61a459478cdc31e8aae22a182cdbf814ba08012" upstream="master"/>
-  <project 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="f691cae2f256d5f72388c0ce9113007a53ad333a" upstream="master"/>
-  <project groups="pdk,linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" revision="59461df1418b3771c11f1957bb8f7f41e399447d" upstream="master"/>
-  <project groups="pdk,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="c1a39ddef8496eb84c49883423a220e7dfe80d06" upstream="master"/>
-  <project groups="pdk" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="494e98c2aca71476d9f9383c1205a7172dddd343" upstream="dev"/>
-  <project groups="darwin,pdk,pdk-cw-fs" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="dacf2de576516f2751420eb60b8daf64d0f91677" upstream="master"/>
-  <project groups="linux,pdk,pdk-cw-fs" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="583652f1b6e213ea1763099736dabc8070798d47" upstream="master"/>
-  <project name="toolchain/binutils" revision="042c220bc2d2c48ecf410b0dfffb388a5d57cccc" upstream="master"/>
-  <project name="toolchain/build" revision="79b5701f1e2f0dee68958c7c4206cdf9c44f1261" upstream="master"/>
-  <project name="toolchain/cloog" revision="604793eab97d360aef729f064674569ee6dbf3e1" upstream="master"/>
-  <project name="toolchain/expat" revision="40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5" upstream="master"/>
-  <project name="toolchain/gcc" revision="81762471dff662de3066037f425d4dadc20be40f" upstream="master"/>
-  <project name="toolchain/gdb" revision="c9f9f54d36124448cf18d57923ec801ca84478b5" upstream="master"/>
-  <project name="toolchain/gmp" revision="b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810" upstream="master"/>
-  <project name="toolchain/isl" revision="b05d4572958c5d497da793f3317084bab90c3033" upstream="master"/>
-  <project name="toolchain/mpc" revision="835d16e92eed875638a8b5d552034c3b1aae045b" upstream="master"/>
-  <project name="toolchain/mpfr" revision="de979fc377db766591e7feaf052f0de59be46e76" upstream="master"/>
-  <project name="toolchain/ndk_chromite_config" path="chromite/config" revision="aaf0bc7c5c33aa92f2b796537cea44309f514e09" upstream="master"/>
-  <project name="toolchain/ppl" revision="979062d362bc5a1c00804237b408b19b4618fb24" upstream="master"/>
-  <project name="toolchain/python" revision="5d4afafe362cfabf6c4783a11c4c80df5afa1e1f" upstream="master"/>
-  <project name="toolchain/sed" revision="45df23d6dc8b51ea5cd903d023c10fd7d72415b9" upstream="master"/>
-  <project name="toolchain/yasm" revision="c78ebe9a44cf69c46fd4e3185fef62e567b5ad4a" upstream="master"/>
-</manifest>
diff --git a/android-mips/gdbserver/manifest_2824841.xml b/android-mips/gdbserver/manifest_2824841.xml
new file mode 100644
index 0000000..a633f26
--- /dev/null
+++ b/android-mips/gdbserver/manifest_2824841.xml
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<manifest>
+  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
+  <default remote="aosp" revision="master" sync-j="4" />
+  <project groups="presubmit" name="platform/bionic" path="bionic" revision="e23df93915dd89ae9661dded3c51bfd5a0bd185e" upstream="master" />
+  <project groups="presubmit" name="platform/development" path="development" revision="6980f5dc5e877fe993868473ffda6111deb06954" upstream="master" />
+  <project groups="presubmit" name="platform/external/googletest" path="external/googletest" revision="013ee6fccb6bb9ebd6215b504f0eef45dccfde4e" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/glslang" path="external/shaderc/glslang" revision="c1ccd4bf91d665a19c7ed2694fe65bf1738a6845" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/shaderc" path="external/shaderc/shaderc" revision="08f8e49598711f107422b6027c26d6957a241e1d" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/spirv-tools" path="external/shaderc/spirv-tools" revision="ed0b8866c47b26c9fe2a728b73392f6baefa2158" upstream="master" />
+  <project groups="presubmit" name="platform/external/vulkan-validation-layers" path="external/vulkan-validation-layers" revision="6130dca5798afb9e08e2b7e532aef5d2ebd4d706" upstream="master" />
+  <project groups="presubmit" name="platform/ndk" path="ndk" revision="92748458b72f89e3d8f9c431ccb615bec8e20c26" upstream="master" />
+  <project name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="33f0063128e4d6ab7f63782c9cd32db4e832848d" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="77a403cdd725a3ba75a4d86d777cc1b2343eba1a" upstream="master" />
+  <project name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="97ebdaddae61ce3a666e8a9a620fc3cc9828bb85" upstream="master" />
+  <project name="platform/prebuilts/cmake/darwin-x86" path="prebuilts/cmake/darwin-x86" revision="d4410da1ac307f4c8362a2b0ae727c682ae06ed4" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/cmake/linux-x86" path="prebuilts/cmake/linux-x86" revision="091caafda44f7fe52a94387b2eafcf204ea909d3" upstream="master" />
+  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="51fa77f10f8c5ee658bfaf3e5a2a29ebd8de50d2" upstream="master" />
+  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" revision="6d08ca9f45ff685648fd13c75bf5cac4b11c19bb" upstream="master" />
+  <project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="39fd9577fe3895a68a921216836ebdd46b4255a8" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e" upstream="master" />
+  <project groups="darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" revision="4ba48d4ace63404304f201dc7d5e87ac55fc7d59" upstream="master" />
+  <project groups="darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="2500bd9aaa640c179730df7f7315d5ee90e4c3c1" upstream="master" />
+  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="423c0265176bcabd1c885f8cf6f0cedf67d3f59b" upstream="master" />
+  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="26e93f6af47f7bd3a9beb5c102a5f45e19bfa38a" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="887574f98e97475d6fb2f91a8f7b24602466017a" upstream="master" />
+  <project groups="presubmit,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="1273431a189717842f033573eb8c777e13dd88b7" upstream="master" />
+  <project groups="presubmit" 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="73ca99196723f810dad42390d154654354f57c16" upstream="master" />
+  <project groups="presubmit" 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="c795eed743bc6cee4ead5407cc237c43abf6fa26" upstream="master" />
+  <project groups="presubmit,linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" revision="88bfecab5b700a1f6a601434d5816fab6c9261fc" upstream="master" />
+  <project groups="presubmit,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="e3b93a8f44d43101b396d41ef30562885714e130" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="0677c905795eac2b69980105c44514df813aed23" upstream="dev" />
+  <project name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="cc147ae2956e96279085abfadda2767b50edc2cc" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="543112c6744acb7a018ac36118eb2a862834809b" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="0c5958b1636c47ed7c284f859c8e805fd06a0e63" upstream="master" />
+  <project groups="linux,presubmit" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="9870834a1f61689aaff1eedda0e1ee73d7150763" upstream="master" />
+  <project groups="presubmit" name="toolchain/binutils" path="toolchain/binutils" revision="d929cfd50d770364fd652d252abc19598b0cc84c" upstream="master" />
+  <project groups="presubmit" name="toolchain/build" path="toolchain/build" revision="f280657461aee54b6d2807881d8a77832f4e794c" upstream="master" />
+  <project groups="presubmit" name="toolchain/cloog" path="toolchain/cloog" revision="604793eab97d360aef729f064674569ee6dbf3e1" upstream="master" />
+  <project groups="presubmit" name="toolchain/expat" path="toolchain/expat" revision="40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5" upstream="master" />
+  <project groups="presubmit" name="toolchain/gcc" path="toolchain/gcc" revision="3791dafeb2d58bc6c45753f4cdf0fa5431963cfa" upstream="master" />
+  <project groups="presubmit" name="toolchain/gdb" path="toolchain/gdb" revision="abe5c08aee8f2602c40a951dae64daac4beb597a" upstream="master" />
+  <project groups="presubmit" name="toolchain/gmp" path="toolchain/gmp" revision="b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810" upstream="master" />
+  <project groups="presubmit" name="toolchain/isl" path="toolchain/isl" revision="0ccf95726af8ce58ad61ff474addbce3a31ba99c" upstream="master" />
+  <project groups="presubmit" name="toolchain/mpc" path="toolchain/mpc" revision="835d16e92eed875638a8b5d552034c3b1aae045b" upstream="master" />
+  <project groups="presubmit" name="toolchain/mpfr" path="toolchain/mpfr" revision="de979fc377db766591e7feaf052f0de59be46e76" upstream="master" />
+  <project groups="presubmit" name="toolchain/ppl" path="toolchain/ppl" revision="979062d362bc5a1c00804237b408b19b4618fb24" upstream="master" />
+  <project groups="presubmit" name="toolchain/python" path="toolchain/python" revision="6a7fc9bfd21da85dda97a8bcd2952e0bfbded424" upstream="master" />
+  <project groups="presubmit" name="toolchain/sed" path="toolchain/sed" revision="45df23d6dc8b51ea5cd903d023c10fd7d72415b9" upstream="master" />
+  <project groups="presubmit" name="toolchain/xz" path="toolchain/xz" revision="595407f5a237e9bfd6821d70096d38825ec9c4e0" upstream="master" />
+  <project groups="presubmit" name="toolchain/yasm" path="toolchain/yasm" revision="a159fe073809b4138cf90b7298ea31ea17af85c0" upstream="master" />
+</manifest>
diff --git a/android-mips64/gdbserver64/gdbserver64 b/android-mips64/gdbserver64/gdbserver64
index 6748ad7..db18317 100755
--- a/android-mips64/gdbserver64/gdbserver64
+++ b/android-mips64/gdbserver64/gdbserver64
Binary files differ
diff --git a/android-mips64/gdbserver64/manifest_2274331.xml b/android-mips64/gdbserver64/manifest_2274331.xml
deleted file mode 100644
index cadf2cf..0000000
--- a/android-mips64/gdbserver64/manifest_2274331.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/"/>
-  
-  <default remote="aosp" revision="master" sync-j="4"/>
-  
-  <project groups="pdk" name="platform/bionic" path="bionic" revision="8d92afe32265be8c36ea2adb3c4059298cd583eb" upstream="master"/>
-  <project groups="pdk-cw-fs" name="platform/development" path="development" revision="54212f988146578dd014c42a8b1e66e98ab740e7" upstream="master"/>
-  <project name="platform/external/chromite" path="chromite" revision="f9a912f6cfbc0c8e9419cafb0c7b1698926dce5f" upstream="master"/>
-  <project name="platform/ndk" path="ndk" revision="d635836b69953d91568a686f5613b1787dc3e1bd" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/clang/darwin-x86/host/3.6" path="prebuilts/clang/darwin-x86/host/3.6" revision="2f82e647995de18b47411091197d47714a502015" upstream="master"/>
-  <project name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/windows-x86/host/3.6" revision="f815c2be35252a78d3c0f4aed41630827f41e71d" upstream="master"/>
-  <project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.6" path="prebuilts/clang/linux-x86/host/3.6" revision="ac7be37a7a0cabeb34c335bf5d8882afcba4efa0" upstream="master"/>
-  <project groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="e821c649f37f3aafa2f84e919bdf006a163b1b76" upstream="master"/>
-  <project groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" revision="6d08ca9f45ff685648fd13c75bf5cac4b11c19bb" upstream="master"/>
-  <project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="83189309ee02314ad9e7147b96c6a893e5cf1ca0" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="8834958755acc291d126ba7ee38ac731d04f9c9e" upstream="master"/>
-  <project groups="pdk,darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" revision="aa65de04f78c9c87805be00666ae0c6bbe0ebfb6" upstream="master"/>
-  <project groups="pdk,darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="c0371efb25365f44e0ad4ea61a74d6e4fb84f3ce" upstream="master"/>
-  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="94cc9234bb6adef9d701819180a3c2db8360ea31" upstream="master"/>
-  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="26e93f6af47f7bd3a9beb5c102a5f45e19bfa38a" upstream="master"/>
-  <project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="a70724fae4d4c571e5657340f80a0c130d5283ec" upstream="master"/>
-  <project groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="63b209feac0b045f5fc68810fd2e65bf1ca51e2f" upstream="master"/>
-  <project 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="f61a459478cdc31e8aae22a182cdbf814ba08012" upstream="master"/>
-  <project 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="f691cae2f256d5f72388c0ce9113007a53ad333a" upstream="master"/>
-  <project groups="pdk,linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" revision="59461df1418b3771c11f1957bb8f7f41e399447d" upstream="master"/>
-  <project groups="pdk,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="c1a39ddef8496eb84c49883423a220e7dfe80d06" upstream="master"/>
-  <project groups="pdk" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="494e98c2aca71476d9f9383c1205a7172dddd343" upstream="dev"/>
-  <project groups="darwin,pdk,pdk-cw-fs" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="dacf2de576516f2751420eb60b8daf64d0f91677" upstream="master"/>
-  <project groups="linux,pdk,pdk-cw-fs" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="583652f1b6e213ea1763099736dabc8070798d47" upstream="master"/>
-  <project name="toolchain/binutils" revision="042c220bc2d2c48ecf410b0dfffb388a5d57cccc" upstream="master"/>
-  <project name="toolchain/build" revision="79b5701f1e2f0dee68958c7c4206cdf9c44f1261" upstream="master"/>
-  <project name="toolchain/cloog" revision="604793eab97d360aef729f064674569ee6dbf3e1" upstream="master"/>
-  <project name="toolchain/expat" revision="40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5" upstream="master"/>
-  <project name="toolchain/gcc" revision="81762471dff662de3066037f425d4dadc20be40f" upstream="master"/>
-  <project name="toolchain/gdb" revision="c9f9f54d36124448cf18d57923ec801ca84478b5" upstream="master"/>
-  <project name="toolchain/gmp" revision="b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810" upstream="master"/>
-  <project name="toolchain/isl" revision="b05d4572958c5d497da793f3317084bab90c3033" upstream="master"/>
-  <project name="toolchain/mpc" revision="835d16e92eed875638a8b5d552034c3b1aae045b" upstream="master"/>
-  <project name="toolchain/mpfr" revision="de979fc377db766591e7feaf052f0de59be46e76" upstream="master"/>
-  <project name="toolchain/ndk_chromite_config" path="chromite/config" revision="aaf0bc7c5c33aa92f2b796537cea44309f514e09" upstream="master"/>
-  <project name="toolchain/ppl" revision="979062d362bc5a1c00804237b408b19b4618fb24" upstream="master"/>
-  <project name="toolchain/python" revision="5d4afafe362cfabf6c4783a11c4c80df5afa1e1f" upstream="master"/>
-  <project name="toolchain/sed" revision="45df23d6dc8b51ea5cd903d023c10fd7d72415b9" upstream="master"/>
-  <project name="toolchain/yasm" revision="c78ebe9a44cf69c46fd4e3185fef62e567b5ad4a" upstream="master"/>
-</manifest>
diff --git a/android-mips64/gdbserver64/manifest_2824841.xml b/android-mips64/gdbserver64/manifest_2824841.xml
new file mode 100644
index 0000000..a633f26
--- /dev/null
+++ b/android-mips64/gdbserver64/manifest_2824841.xml
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<manifest>
+  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
+  <default remote="aosp" revision="master" sync-j="4" />
+  <project groups="presubmit" name="platform/bionic" path="bionic" revision="e23df93915dd89ae9661dded3c51bfd5a0bd185e" upstream="master" />
+  <project groups="presubmit" name="platform/development" path="development" revision="6980f5dc5e877fe993868473ffda6111deb06954" upstream="master" />
+  <project groups="presubmit" name="platform/external/googletest" path="external/googletest" revision="013ee6fccb6bb9ebd6215b504f0eef45dccfde4e" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/glslang" path="external/shaderc/glslang" revision="c1ccd4bf91d665a19c7ed2694fe65bf1738a6845" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/shaderc" path="external/shaderc/shaderc" revision="08f8e49598711f107422b6027c26d6957a241e1d" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/spirv-tools" path="external/shaderc/spirv-tools" revision="ed0b8866c47b26c9fe2a728b73392f6baefa2158" upstream="master" />
+  <project groups="presubmit" name="platform/external/vulkan-validation-layers" path="external/vulkan-validation-layers" revision="6130dca5798afb9e08e2b7e532aef5d2ebd4d706" upstream="master" />
+  <project groups="presubmit" name="platform/ndk" path="ndk" revision="92748458b72f89e3d8f9c431ccb615bec8e20c26" upstream="master" />
+  <project name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="33f0063128e4d6ab7f63782c9cd32db4e832848d" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="77a403cdd725a3ba75a4d86d777cc1b2343eba1a" upstream="master" />
+  <project name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="97ebdaddae61ce3a666e8a9a620fc3cc9828bb85" upstream="master" />
+  <project name="platform/prebuilts/cmake/darwin-x86" path="prebuilts/cmake/darwin-x86" revision="d4410da1ac307f4c8362a2b0ae727c682ae06ed4" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/cmake/linux-x86" path="prebuilts/cmake/linux-x86" revision="091caafda44f7fe52a94387b2eafcf204ea909d3" upstream="master" />
+  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="51fa77f10f8c5ee658bfaf3e5a2a29ebd8de50d2" upstream="master" />
+  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" revision="6d08ca9f45ff685648fd13c75bf5cac4b11c19bb" upstream="master" />
+  <project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="39fd9577fe3895a68a921216836ebdd46b4255a8" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e" upstream="master" />
+  <project groups="darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" revision="4ba48d4ace63404304f201dc7d5e87ac55fc7d59" upstream="master" />
+  <project groups="darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="2500bd9aaa640c179730df7f7315d5ee90e4c3c1" upstream="master" />
+  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="423c0265176bcabd1c885f8cf6f0cedf67d3f59b" upstream="master" />
+  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="26e93f6af47f7bd3a9beb5c102a5f45e19bfa38a" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="887574f98e97475d6fb2f91a8f7b24602466017a" upstream="master" />
+  <project groups="presubmit,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="1273431a189717842f033573eb8c777e13dd88b7" upstream="master" />
+  <project groups="presubmit" 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="73ca99196723f810dad42390d154654354f57c16" upstream="master" />
+  <project groups="presubmit" 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="c795eed743bc6cee4ead5407cc237c43abf6fa26" upstream="master" />
+  <project groups="presubmit,linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" revision="88bfecab5b700a1f6a601434d5816fab6c9261fc" upstream="master" />
+  <project groups="presubmit,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="e3b93a8f44d43101b396d41ef30562885714e130" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="0677c905795eac2b69980105c44514df813aed23" upstream="dev" />
+  <project name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="cc147ae2956e96279085abfadda2767b50edc2cc" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="543112c6744acb7a018ac36118eb2a862834809b" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="0c5958b1636c47ed7c284f859c8e805fd06a0e63" upstream="master" />
+  <project groups="linux,presubmit" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="9870834a1f61689aaff1eedda0e1ee73d7150763" upstream="master" />
+  <project groups="presubmit" name="toolchain/binutils" path="toolchain/binutils" revision="d929cfd50d770364fd652d252abc19598b0cc84c" upstream="master" />
+  <project groups="presubmit" name="toolchain/build" path="toolchain/build" revision="f280657461aee54b6d2807881d8a77832f4e794c" upstream="master" />
+  <project groups="presubmit" name="toolchain/cloog" path="toolchain/cloog" revision="604793eab97d360aef729f064674569ee6dbf3e1" upstream="master" />
+  <project groups="presubmit" name="toolchain/expat" path="toolchain/expat" revision="40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5" upstream="master" />
+  <project groups="presubmit" name="toolchain/gcc" path="toolchain/gcc" revision="3791dafeb2d58bc6c45753f4cdf0fa5431963cfa" upstream="master" />
+  <project groups="presubmit" name="toolchain/gdb" path="toolchain/gdb" revision="abe5c08aee8f2602c40a951dae64daac4beb597a" upstream="master" />
+  <project groups="presubmit" name="toolchain/gmp" path="toolchain/gmp" revision="b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810" upstream="master" />
+  <project groups="presubmit" name="toolchain/isl" path="toolchain/isl" revision="0ccf95726af8ce58ad61ff474addbce3a31ba99c" upstream="master" />
+  <project groups="presubmit" name="toolchain/mpc" path="toolchain/mpc" revision="835d16e92eed875638a8b5d552034c3b1aae045b" upstream="master" />
+  <project groups="presubmit" name="toolchain/mpfr" path="toolchain/mpfr" revision="de979fc377db766591e7feaf052f0de59be46e76" upstream="master" />
+  <project groups="presubmit" name="toolchain/ppl" path="toolchain/ppl" revision="979062d362bc5a1c00804237b408b19b4618fb24" upstream="master" />
+  <project groups="presubmit" name="toolchain/python" path="toolchain/python" revision="6a7fc9bfd21da85dda97a8bcd2952e0bfbded424" upstream="master" />
+  <project groups="presubmit" name="toolchain/sed" path="toolchain/sed" revision="45df23d6dc8b51ea5cd903d023c10fd7d72415b9" upstream="master" />
+  <project groups="presubmit" name="toolchain/xz" path="toolchain/xz" revision="595407f5a237e9bfd6821d70096d38825ec9c4e0" upstream="master" />
+  <project groups="presubmit" name="toolchain/yasm" path="toolchain/yasm" revision="a159fe073809b4138cf90b7298ea31ea17af85c0" upstream="master" />
+</manifest>
diff --git a/android-x86/gdbserver/gdbserver b/android-x86/gdbserver/gdbserver
index 31bca61..3300868 100755
--- a/android-x86/gdbserver/gdbserver
+++ b/android-x86/gdbserver/gdbserver
Binary files differ
diff --git a/android-x86/gdbserver/manifest_2274331.xml b/android-x86/gdbserver/manifest_2274331.xml
deleted file mode 100644
index cadf2cf..0000000
--- a/android-x86/gdbserver/manifest_2274331.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/"/>
-  
-  <default remote="aosp" revision="master" sync-j="4"/>
-  
-  <project groups="pdk" name="platform/bionic" path="bionic" revision="8d92afe32265be8c36ea2adb3c4059298cd583eb" upstream="master"/>
-  <project groups="pdk-cw-fs" name="platform/development" path="development" revision="54212f988146578dd014c42a8b1e66e98ab740e7" upstream="master"/>
-  <project name="platform/external/chromite" path="chromite" revision="f9a912f6cfbc0c8e9419cafb0c7b1698926dce5f" upstream="master"/>
-  <project name="platform/ndk" path="ndk" revision="d635836b69953d91568a686f5613b1787dc3e1bd" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/clang/darwin-x86/host/3.6" path="prebuilts/clang/darwin-x86/host/3.6" revision="2f82e647995de18b47411091197d47714a502015" upstream="master"/>
-  <project name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/windows-x86/host/3.6" revision="f815c2be35252a78d3c0f4aed41630827f41e71d" upstream="master"/>
-  <project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.6" path="prebuilts/clang/linux-x86/host/3.6" revision="ac7be37a7a0cabeb34c335bf5d8882afcba4efa0" upstream="master"/>
-  <project groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="e821c649f37f3aafa2f84e919bdf006a163b1b76" upstream="master"/>
-  <project groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" revision="6d08ca9f45ff685648fd13c75bf5cac4b11c19bb" upstream="master"/>
-  <project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="83189309ee02314ad9e7147b96c6a893e5cf1ca0" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="8834958755acc291d126ba7ee38ac731d04f9c9e" upstream="master"/>
-  <project groups="pdk,darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" revision="aa65de04f78c9c87805be00666ae0c6bbe0ebfb6" upstream="master"/>
-  <project groups="pdk,darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="c0371efb25365f44e0ad4ea61a74d6e4fb84f3ce" upstream="master"/>
-  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="94cc9234bb6adef9d701819180a3c2db8360ea31" upstream="master"/>
-  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="26e93f6af47f7bd3a9beb5c102a5f45e19bfa38a" upstream="master"/>
-  <project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="a70724fae4d4c571e5657340f80a0c130d5283ec" upstream="master"/>
-  <project groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="63b209feac0b045f5fc68810fd2e65bf1ca51e2f" upstream="master"/>
-  <project 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="f61a459478cdc31e8aae22a182cdbf814ba08012" upstream="master"/>
-  <project 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="f691cae2f256d5f72388c0ce9113007a53ad333a" upstream="master"/>
-  <project groups="pdk,linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" revision="59461df1418b3771c11f1957bb8f7f41e399447d" upstream="master"/>
-  <project groups="pdk,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="c1a39ddef8496eb84c49883423a220e7dfe80d06" upstream="master"/>
-  <project groups="pdk" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="494e98c2aca71476d9f9383c1205a7172dddd343" upstream="dev"/>
-  <project groups="darwin,pdk,pdk-cw-fs" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="dacf2de576516f2751420eb60b8daf64d0f91677" upstream="master"/>
-  <project groups="linux,pdk,pdk-cw-fs" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="583652f1b6e213ea1763099736dabc8070798d47" upstream="master"/>
-  <project name="toolchain/binutils" revision="042c220bc2d2c48ecf410b0dfffb388a5d57cccc" upstream="master"/>
-  <project name="toolchain/build" revision="79b5701f1e2f0dee68958c7c4206cdf9c44f1261" upstream="master"/>
-  <project name="toolchain/cloog" revision="604793eab97d360aef729f064674569ee6dbf3e1" upstream="master"/>
-  <project name="toolchain/expat" revision="40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5" upstream="master"/>
-  <project name="toolchain/gcc" revision="81762471dff662de3066037f425d4dadc20be40f" upstream="master"/>
-  <project name="toolchain/gdb" revision="c9f9f54d36124448cf18d57923ec801ca84478b5" upstream="master"/>
-  <project name="toolchain/gmp" revision="b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810" upstream="master"/>
-  <project name="toolchain/isl" revision="b05d4572958c5d497da793f3317084bab90c3033" upstream="master"/>
-  <project name="toolchain/mpc" revision="835d16e92eed875638a8b5d552034c3b1aae045b" upstream="master"/>
-  <project name="toolchain/mpfr" revision="de979fc377db766591e7feaf052f0de59be46e76" upstream="master"/>
-  <project name="toolchain/ndk_chromite_config" path="chromite/config" revision="aaf0bc7c5c33aa92f2b796537cea44309f514e09" upstream="master"/>
-  <project name="toolchain/ppl" revision="979062d362bc5a1c00804237b408b19b4618fb24" upstream="master"/>
-  <project name="toolchain/python" revision="5d4afafe362cfabf6c4783a11c4c80df5afa1e1f" upstream="master"/>
-  <project name="toolchain/sed" revision="45df23d6dc8b51ea5cd903d023c10fd7d72415b9" upstream="master"/>
-  <project name="toolchain/yasm" revision="c78ebe9a44cf69c46fd4e3185fef62e567b5ad4a" upstream="master"/>
-</manifest>
diff --git a/android-x86/gdbserver/manifest_2824841.xml b/android-x86/gdbserver/manifest_2824841.xml
new file mode 100644
index 0000000..a633f26
--- /dev/null
+++ b/android-x86/gdbserver/manifest_2824841.xml
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<manifest>
+  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
+  <default remote="aosp" revision="master" sync-j="4" />
+  <project groups="presubmit" name="platform/bionic" path="bionic" revision="e23df93915dd89ae9661dded3c51bfd5a0bd185e" upstream="master" />
+  <project groups="presubmit" name="platform/development" path="development" revision="6980f5dc5e877fe993868473ffda6111deb06954" upstream="master" />
+  <project groups="presubmit" name="platform/external/googletest" path="external/googletest" revision="013ee6fccb6bb9ebd6215b504f0eef45dccfde4e" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/glslang" path="external/shaderc/glslang" revision="c1ccd4bf91d665a19c7ed2694fe65bf1738a6845" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/shaderc" path="external/shaderc/shaderc" revision="08f8e49598711f107422b6027c26d6957a241e1d" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/spirv-tools" path="external/shaderc/spirv-tools" revision="ed0b8866c47b26c9fe2a728b73392f6baefa2158" upstream="master" />
+  <project groups="presubmit" name="platform/external/vulkan-validation-layers" path="external/vulkan-validation-layers" revision="6130dca5798afb9e08e2b7e532aef5d2ebd4d706" upstream="master" />
+  <project groups="presubmit" name="platform/ndk" path="ndk" revision="92748458b72f89e3d8f9c431ccb615bec8e20c26" upstream="master" />
+  <project name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="33f0063128e4d6ab7f63782c9cd32db4e832848d" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="77a403cdd725a3ba75a4d86d777cc1b2343eba1a" upstream="master" />
+  <project name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="97ebdaddae61ce3a666e8a9a620fc3cc9828bb85" upstream="master" />
+  <project name="platform/prebuilts/cmake/darwin-x86" path="prebuilts/cmake/darwin-x86" revision="d4410da1ac307f4c8362a2b0ae727c682ae06ed4" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/cmake/linux-x86" path="prebuilts/cmake/linux-x86" revision="091caafda44f7fe52a94387b2eafcf204ea909d3" upstream="master" />
+  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="51fa77f10f8c5ee658bfaf3e5a2a29ebd8de50d2" upstream="master" />
+  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" revision="6d08ca9f45ff685648fd13c75bf5cac4b11c19bb" upstream="master" />
+  <project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="39fd9577fe3895a68a921216836ebdd46b4255a8" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e" upstream="master" />
+  <project groups="darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" revision="4ba48d4ace63404304f201dc7d5e87ac55fc7d59" upstream="master" />
+  <project groups="darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="2500bd9aaa640c179730df7f7315d5ee90e4c3c1" upstream="master" />
+  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="423c0265176bcabd1c885f8cf6f0cedf67d3f59b" upstream="master" />
+  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="26e93f6af47f7bd3a9beb5c102a5f45e19bfa38a" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="887574f98e97475d6fb2f91a8f7b24602466017a" upstream="master" />
+  <project groups="presubmit,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="1273431a189717842f033573eb8c777e13dd88b7" upstream="master" />
+  <project groups="presubmit" 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="73ca99196723f810dad42390d154654354f57c16" upstream="master" />
+  <project groups="presubmit" 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="c795eed743bc6cee4ead5407cc237c43abf6fa26" upstream="master" />
+  <project groups="presubmit,linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" revision="88bfecab5b700a1f6a601434d5816fab6c9261fc" upstream="master" />
+  <project groups="presubmit,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="e3b93a8f44d43101b396d41ef30562885714e130" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="0677c905795eac2b69980105c44514df813aed23" upstream="dev" />
+  <project name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="cc147ae2956e96279085abfadda2767b50edc2cc" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="543112c6744acb7a018ac36118eb2a862834809b" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="0c5958b1636c47ed7c284f859c8e805fd06a0e63" upstream="master" />
+  <project groups="linux,presubmit" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="9870834a1f61689aaff1eedda0e1ee73d7150763" upstream="master" />
+  <project groups="presubmit" name="toolchain/binutils" path="toolchain/binutils" revision="d929cfd50d770364fd652d252abc19598b0cc84c" upstream="master" />
+  <project groups="presubmit" name="toolchain/build" path="toolchain/build" revision="f280657461aee54b6d2807881d8a77832f4e794c" upstream="master" />
+  <project groups="presubmit" name="toolchain/cloog" path="toolchain/cloog" revision="604793eab97d360aef729f064674569ee6dbf3e1" upstream="master" />
+  <project groups="presubmit" name="toolchain/expat" path="toolchain/expat" revision="40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5" upstream="master" />
+  <project groups="presubmit" name="toolchain/gcc" path="toolchain/gcc" revision="3791dafeb2d58bc6c45753f4cdf0fa5431963cfa" upstream="master" />
+  <project groups="presubmit" name="toolchain/gdb" path="toolchain/gdb" revision="abe5c08aee8f2602c40a951dae64daac4beb597a" upstream="master" />
+  <project groups="presubmit" name="toolchain/gmp" path="toolchain/gmp" revision="b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810" upstream="master" />
+  <project groups="presubmit" name="toolchain/isl" path="toolchain/isl" revision="0ccf95726af8ce58ad61ff474addbce3a31ba99c" upstream="master" />
+  <project groups="presubmit" name="toolchain/mpc" path="toolchain/mpc" revision="835d16e92eed875638a8b5d552034c3b1aae045b" upstream="master" />
+  <project groups="presubmit" name="toolchain/mpfr" path="toolchain/mpfr" revision="de979fc377db766591e7feaf052f0de59be46e76" upstream="master" />
+  <project groups="presubmit" name="toolchain/ppl" path="toolchain/ppl" revision="979062d362bc5a1c00804237b408b19b4618fb24" upstream="master" />
+  <project groups="presubmit" name="toolchain/python" path="toolchain/python" revision="6a7fc9bfd21da85dda97a8bcd2952e0bfbded424" upstream="master" />
+  <project groups="presubmit" name="toolchain/sed" path="toolchain/sed" revision="45df23d6dc8b51ea5cd903d023c10fd7d72415b9" upstream="master" />
+  <project groups="presubmit" name="toolchain/xz" path="toolchain/xz" revision="595407f5a237e9bfd6821d70096d38825ec9c4e0" upstream="master" />
+  <project groups="presubmit" name="toolchain/yasm" path="toolchain/yasm" revision="a159fe073809b4138cf90b7298ea31ea17af85c0" upstream="master" />
+</manifest>
diff --git a/android-x86_64/gdbserver64/gdbserver64 b/android-x86_64/gdbserver64/gdbserver64
index 734c0dc..62de3f5 100755
--- a/android-x86_64/gdbserver64/gdbserver64
+++ b/android-x86_64/gdbserver64/gdbserver64
Binary files differ
diff --git a/android-x86_64/gdbserver64/manifest_2274331.xml b/android-x86_64/gdbserver64/manifest_2274331.xml
deleted file mode 100644
index cadf2cf..0000000
--- a/android-x86_64/gdbserver64/manifest_2274331.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/"/>
-  
-  <default remote="aosp" revision="master" sync-j="4"/>
-  
-  <project groups="pdk" name="platform/bionic" path="bionic" revision="8d92afe32265be8c36ea2adb3c4059298cd583eb" upstream="master"/>
-  <project groups="pdk-cw-fs" name="platform/development" path="development" revision="54212f988146578dd014c42a8b1e66e98ab740e7" upstream="master"/>
-  <project name="platform/external/chromite" path="chromite" revision="f9a912f6cfbc0c8e9419cafb0c7b1698926dce5f" upstream="master"/>
-  <project name="platform/ndk" path="ndk" revision="d635836b69953d91568a686f5613b1787dc3e1bd" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/clang/darwin-x86/host/3.6" path="prebuilts/clang/darwin-x86/host/3.6" revision="2f82e647995de18b47411091197d47714a502015" upstream="master"/>
-  <project name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/windows-x86/host/3.6" revision="f815c2be35252a78d3c0f4aed41630827f41e71d" upstream="master"/>
-  <project groups="pdk,linux" name="platform/prebuilts/clang/linux-x86/host/3.6" path="prebuilts/clang/linux-x86/host/3.6" revision="ac7be37a7a0cabeb34c335bf5d8882afcba4efa0" upstream="master"/>
-  <project groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="e821c649f37f3aafa2f84e919bdf006a163b1b76" upstream="master"/>
-  <project groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" revision="6d08ca9f45ff685648fd13c75bf5cac4b11c19bb" upstream="master"/>
-  <project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="83189309ee02314ad9e7147b96c6a893e5cf1ca0" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="master"/>
-  <project groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="8834958755acc291d126ba7ee38ac731d04f9c9e" upstream="master"/>
-  <project groups="pdk,darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" revision="aa65de04f78c9c87805be00666ae0c6bbe0ebfb6" upstream="master"/>
-  <project groups="pdk,darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="c0371efb25365f44e0ad4ea61a74d6e4fb84f3ce" upstream="master"/>
-  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="94cc9234bb6adef9d701819180a3c2db8360ea31" upstream="master"/>
-  <project groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="26e93f6af47f7bd3a9beb5c102a5f45e19bfa38a" upstream="master"/>
-  <project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="a70724fae4d4c571e5657340f80a0c130d5283ec" upstream="master"/>
-  <project groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="63b209feac0b045f5fc68810fd2e65bf1ca51e2f" upstream="master"/>
-  <project 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="f61a459478cdc31e8aae22a182cdbf814ba08012" upstream="master"/>
-  <project 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="f691cae2f256d5f72388c0ce9113007a53ad333a" upstream="master"/>
-  <project groups="pdk,linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" revision="59461df1418b3771c11f1957bb8f7f41e399447d" upstream="master"/>
-  <project groups="pdk,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="c1a39ddef8496eb84c49883423a220e7dfe80d06" upstream="master"/>
-  <project groups="pdk" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="494e98c2aca71476d9f9383c1205a7172dddd343" upstream="dev"/>
-  <project groups="darwin,pdk,pdk-cw-fs" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="dacf2de576516f2751420eb60b8daf64d0f91677" upstream="master"/>
-  <project groups="linux,pdk,pdk-cw-fs" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="583652f1b6e213ea1763099736dabc8070798d47" upstream="master"/>
-  <project name="toolchain/binutils" revision="042c220bc2d2c48ecf410b0dfffb388a5d57cccc" upstream="master"/>
-  <project name="toolchain/build" revision="79b5701f1e2f0dee68958c7c4206cdf9c44f1261" upstream="master"/>
-  <project name="toolchain/cloog" revision="604793eab97d360aef729f064674569ee6dbf3e1" upstream="master"/>
-  <project name="toolchain/expat" revision="40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5" upstream="master"/>
-  <project name="toolchain/gcc" revision="81762471dff662de3066037f425d4dadc20be40f" upstream="master"/>
-  <project name="toolchain/gdb" revision="c9f9f54d36124448cf18d57923ec801ca84478b5" upstream="master"/>
-  <project name="toolchain/gmp" revision="b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810" upstream="master"/>
-  <project name="toolchain/isl" revision="b05d4572958c5d497da793f3317084bab90c3033" upstream="master"/>
-  <project name="toolchain/mpc" revision="835d16e92eed875638a8b5d552034c3b1aae045b" upstream="master"/>
-  <project name="toolchain/mpfr" revision="de979fc377db766591e7feaf052f0de59be46e76" upstream="master"/>
-  <project name="toolchain/ndk_chromite_config" path="chromite/config" revision="aaf0bc7c5c33aa92f2b796537cea44309f514e09" upstream="master"/>
-  <project name="toolchain/ppl" revision="979062d362bc5a1c00804237b408b19b4618fb24" upstream="master"/>
-  <project name="toolchain/python" revision="5d4afafe362cfabf6c4783a11c4c80df5afa1e1f" upstream="master"/>
-  <project name="toolchain/sed" revision="45df23d6dc8b51ea5cd903d023c10fd7d72415b9" upstream="master"/>
-  <project name="toolchain/yasm" revision="c78ebe9a44cf69c46fd4e3185fef62e567b5ad4a" upstream="master"/>
-</manifest>
diff --git a/android-x86_64/gdbserver64/manifest_2824841.xml b/android-x86_64/gdbserver64/manifest_2824841.xml
new file mode 100644
index 0000000..a633f26
--- /dev/null
+++ b/android-x86_64/gdbserver64/manifest_2824841.xml
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<manifest>
+  <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
+  <default remote="aosp" revision="master" sync-j="4" />
+  <project groups="presubmit" name="platform/bionic" path="bionic" revision="e23df93915dd89ae9661dded3c51bfd5a0bd185e" upstream="master" />
+  <project groups="presubmit" name="platform/development" path="development" revision="6980f5dc5e877fe993868473ffda6111deb06954" upstream="master" />
+  <project groups="presubmit" name="platform/external/googletest" path="external/googletest" revision="013ee6fccb6bb9ebd6215b504f0eef45dccfde4e" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/glslang" path="external/shaderc/glslang" revision="c1ccd4bf91d665a19c7ed2694fe65bf1738a6845" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/shaderc" path="external/shaderc/shaderc" revision="08f8e49598711f107422b6027c26d6957a241e1d" upstream="master" />
+  <project groups="presubmit" name="platform/external/shaderc/spirv-tools" path="external/shaderc/spirv-tools" revision="ed0b8866c47b26c9fe2a728b73392f6baefa2158" upstream="master" />
+  <project groups="presubmit" name="platform/external/vulkan-validation-layers" path="external/vulkan-validation-layers" revision="6130dca5798afb9e08e2b7e532aef5d2ebd4d706" upstream="master" />
+  <project groups="presubmit" name="platform/ndk" path="ndk" revision="92748458b72f89e3d8f9c431ccb615bec8e20c26" upstream="master" />
+  <project name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="33f0063128e4d6ab7f63782c9cd32db4e832848d" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="77a403cdd725a3ba75a4d86d777cc1b2343eba1a" upstream="master" />
+  <project name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="97ebdaddae61ce3a666e8a9a620fc3cc9828bb85" upstream="master" />
+  <project name="platform/prebuilts/cmake/darwin-x86" path="prebuilts/cmake/darwin-x86" revision="d4410da1ac307f4c8362a2b0ae727c682ae06ed4" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/cmake/linux-x86" path="prebuilts/cmake/linux-x86" revision="091caafda44f7fe52a94387b2eafcf204ea909d3" upstream="master" />
+  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" revision="51fa77f10f8c5ee658bfaf3e5a2a29ebd8de50d2" upstream="master" />
+  <project groups="darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" revision="6d08ca9f45ff685648fd13c75bf5cac4b11c19bb" upstream="master" />
+  <project name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" revision="39fd9577fe3895a68a921216836ebdd46b4255a8" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e" upstream="master" />
+  <project groups="darwin,mips" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" revision="4ba48d4ace63404304f201dc7d5e87ac55fc7d59" upstream="master" />
+  <project groups="darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" revision="2500bd9aaa640c179730df7f7315d5ee90e4c3c1" upstream="master" />
+  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" revision="423c0265176bcabd1c885f8cf6f0cedf67d3f59b" upstream="master" />
+  <project groups="presubmit,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" revision="26e93f6af47f7bd3a9beb5c102a5f45e19bfa38a" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="887574f98e97475d6fb2f91a8f7b24602466017a" upstream="master" />
+  <project groups="presubmit,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" revision="1273431a189717842f033573eb8c777e13dd88b7" upstream="master" />
+  <project groups="presubmit" 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="73ca99196723f810dad42390d154654354f57c16" upstream="master" />
+  <project groups="presubmit" 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="c795eed743bc6cee4ead5407cc237c43abf6fa26" upstream="master" />
+  <project groups="presubmit,linux,mips" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" revision="88bfecab5b700a1f6a601434d5816fab6c9261fc" upstream="master" />
+  <project groups="presubmit,linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="e3b93a8f44d43101b396d41ef30562885714e130" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="0677c905795eac2b69980105c44514df813aed23" upstream="dev" />
+  <project name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="cc147ae2956e96279085abfadda2767b50edc2cc" upstream="master" />
+  <project groups="presubmit" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="543112c6744acb7a018ac36118eb2a862834809b" upstream="master" />
+  <project groups="darwin" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="0c5958b1636c47ed7c284f859c8e805fd06a0e63" upstream="master" />
+  <project groups="linux,presubmit" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="9870834a1f61689aaff1eedda0e1ee73d7150763" upstream="master" />
+  <project groups="presubmit" name="toolchain/binutils" path="toolchain/binutils" revision="d929cfd50d770364fd652d252abc19598b0cc84c" upstream="master" />
+  <project groups="presubmit" name="toolchain/build" path="toolchain/build" revision="f280657461aee54b6d2807881d8a77832f4e794c" upstream="master" />
+  <project groups="presubmit" name="toolchain/cloog" path="toolchain/cloog" revision="604793eab97d360aef729f064674569ee6dbf3e1" upstream="master" />
+  <project groups="presubmit" name="toolchain/expat" path="toolchain/expat" revision="40172a0ae9d40a068f1e1a48ffcf6a1ccf765ed5" upstream="master" />
+  <project groups="presubmit" name="toolchain/gcc" path="toolchain/gcc" revision="3791dafeb2d58bc6c45753f4cdf0fa5431963cfa" upstream="master" />
+  <project groups="presubmit" name="toolchain/gdb" path="toolchain/gdb" revision="abe5c08aee8f2602c40a951dae64daac4beb597a" upstream="master" />
+  <project groups="presubmit" name="toolchain/gmp" path="toolchain/gmp" revision="b2acd5dbf47868ac5b5bc844e16d2cadcbd4c810" upstream="master" />
+  <project groups="presubmit" name="toolchain/isl" path="toolchain/isl" revision="0ccf95726af8ce58ad61ff474addbce3a31ba99c" upstream="master" />
+  <project groups="presubmit" name="toolchain/mpc" path="toolchain/mpc" revision="835d16e92eed875638a8b5d552034c3b1aae045b" upstream="master" />
+  <project groups="presubmit" name="toolchain/mpfr" path="toolchain/mpfr" revision="de979fc377db766591e7feaf052f0de59be46e76" upstream="master" />
+  <project groups="presubmit" name="toolchain/ppl" path="toolchain/ppl" revision="979062d362bc5a1c00804237b408b19b4618fb24" upstream="master" />
+  <project groups="presubmit" name="toolchain/python" path="toolchain/python" revision="6a7fc9bfd21da85dda97a8bcd2952e0bfbded424" upstream="master" />
+  <project groups="presubmit" name="toolchain/sed" path="toolchain/sed" revision="45df23d6dc8b51ea5cd903d023c10fd7d72415b9" upstream="master" />
+  <project groups="presubmit" name="toolchain/xz" path="toolchain/xz" revision="595407f5a237e9bfd6821d70096d38825ec9c4e0" upstream="master" />
+  <project groups="presubmit" name="toolchain/yasm" path="toolchain/yasm" revision="a159fe073809b4138cf90b7298ea31ea17af85c0" upstream="master" />
+</manifest>