diff --git a/darwin-x86/bin/ckati b/darwin-x86/bin/ckati
index e034804..740b7ec 100755
--- a/darwin-x86/bin/ckati
+++ b/darwin-x86/bin/ckati
Binary files differ
diff --git a/darwin-x86/bin/ckati_stamp_dump b/darwin-x86/bin/ckati_stamp_dump
index d4fedd2..0349320 100755
--- a/darwin-x86/bin/ckati_stamp_dump
+++ b/darwin-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/darwin-x86/bin/header-abi-diff b/darwin-x86/bin/header-abi-diff
index 9c7c3ac..30cee16 100755
--- a/darwin-x86/bin/header-abi-diff
+++ b/darwin-x86/bin/header-abi-diff
Binary files differ
diff --git a/darwin-x86/bin/header-abi-dumper b/darwin-x86/bin/header-abi-dumper
index 427f8e0..9908204 100755
--- a/darwin-x86/bin/header-abi-dumper
+++ b/darwin-x86/bin/header-abi-dumper
Binary files differ
diff --git a/darwin-x86/bin/header-abi-linker b/darwin-x86/bin/header-abi-linker
index 57fcc5d..40b4bdc 100755
--- a/darwin-x86/bin/header-abi-linker
+++ b/darwin-x86/bin/header-abi-linker
Binary files differ
diff --git a/darwin-x86/bin/merge-abi-diff b/darwin-x86/bin/merge-abi-diff
new file mode 100755
index 0000000..513f9f4
--- /dev/null
+++ b/darwin-x86/bin/merge-abi-diff
Binary files differ
diff --git a/darwin-x86/bin/ninja b/darwin-x86/bin/ninja
index c8cc7a9..5f0c250 100755
--- a/darwin-x86/bin/ninja
+++ b/darwin-x86/bin/ninja
Binary files differ
diff --git a/darwin-x86/lib64/libprotobuf-cpp-full.dylib b/darwin-x86/lib64/libprotobuf-cpp-full.dylib
index cdd4577..b895b1b 100755
--- a/darwin-x86/lib64/libprotobuf-cpp-full.dylib
+++ b/darwin-x86/lib64/libprotobuf-cpp-full.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libz-host.dylib b/darwin-x86/lib64/libz-host.dylib
index a4f9193..ee436ad 100755
--- a/darwin-x86/lib64/libz-host.dylib
+++ b/darwin-x86/lib64/libz-host.dylib
Binary files differ
diff --git a/linux-x86/asan/bin/ckati b/linux-x86/asan/bin/ckati
index ecbf7b3..c601773 100755
--- a/linux-x86/asan/bin/ckati
+++ b/linux-x86/asan/bin/ckati
Binary files differ
diff --git a/linux-x86/asan/bin/ninja b/linux-x86/asan/bin/ninja
index fe17cb8..62042d1 100755
--- a/linux-x86/asan/bin/ninja
+++ b/linux-x86/asan/bin/ninja
Binary files differ
diff --git a/linux-x86/bin/ckati b/linux-x86/bin/ckati
index 0d9d222..efa3d1d 100755
--- a/linux-x86/bin/ckati
+++ b/linux-x86/bin/ckati
Binary files differ
diff --git a/linux-x86/bin/ckati_stamp_dump b/linux-x86/bin/ckati_stamp_dump
index fb51137..5104a2b 100755
--- a/linux-x86/bin/ckati_stamp_dump
+++ b/linux-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/linux-x86/bin/header-abi-diff b/linux-x86/bin/header-abi-diff
index 8ab19c0..edc5617 100755
--- a/linux-x86/bin/header-abi-diff
+++ b/linux-x86/bin/header-abi-diff
Binary files differ
diff --git a/linux-x86/bin/header-abi-dumper b/linux-x86/bin/header-abi-dumper
index bfd81dd..3aef860 100755
--- a/linux-x86/bin/header-abi-dumper
+++ b/linux-x86/bin/header-abi-dumper
Binary files differ
diff --git a/linux-x86/bin/header-abi-linker b/linux-x86/bin/header-abi-linker
index e8603bc..56f2833 100755
--- a/linux-x86/bin/header-abi-linker
+++ b/linux-x86/bin/header-abi-linker
Binary files differ
diff --git a/linux-x86/bin/merge-abi-diff b/linux-x86/bin/merge-abi-diff
new file mode 100755
index 0000000..9bbb032
--- /dev/null
+++ b/linux-x86/bin/merge-abi-diff
Binary files differ
diff --git a/linux-x86/bin/ninja b/linux-x86/bin/ninja
index f82b0ad..c5e1e0a 100755
--- a/linux-x86/bin/ninja
+++ b/linux-x86/bin/ninja
Binary files differ
diff --git a/linux-x86/lib64/libprotobuf-cpp-full.so b/linux-x86/lib64/libprotobuf-cpp-full.so
index 31a8733..5bdf2df 100755
--- a/linux-x86/lib64/libprotobuf-cpp-full.so
+++ b/linux-x86/lib64/libprotobuf-cpp-full.so
Binary files differ
diff --git a/linux-x86/lib64/libz-host.so b/linux-x86/lib64/libz-host.so
index 86bcf53..63f2c9c 100755
--- a/linux-x86/lib64/libz-host.so
+++ b/linux-x86/lib64/libz-host.so
Binary files differ
diff --git a/manifest.xml b/manifest.xml
index 6e25c15..4670688 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -3,42 +3,42 @@
   <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
   <default remote="aosp" revision="master" sync-j="4" />
   <!-- build projects -->
-  <project name="platform/build" path="build/make" revision="01f4e201726e8029fbfb0e3a730890d9f1366844" upstream="master">
+  <project name="platform/build" path="build/make" revision="81787c1bbc69ea1a89495cfc2b801ef77219db47" upstream="master">
     <linkfile dest="build/tools" src="tools" />
   </project>
-  <project name="platform/build/blueprint" path="build/blueprint" revision="e36ad10ea36302ade99b23e4ea1f4fed308a5116" upstream="master" />
-  <project name="platform/build/kati" path="build/kati" revision="4124b98e2ff330b87ba8ba878a8affbde898df82" upstream="master" />
-  <project name="platform/build/soong" path="build/soong" revision="c43ae770c56808c802916e6346576f3f0c047194" upstream="master">
+  <project name="platform/build/blueprint" path="build/blueprint" revision="e257cf82bdb9c5c1c35969e1977470fb6fb96837" upstream="master" />
+  <project name="platform/build/kati" path="build/kati" revision="59a7a0e0f750f53049702937d0000c7ca86092e5" upstream="master" />
+  <project name="platform/build/soong" path="build/soong" revision="977fd8f1fa60ea51f280962e3074d6999ff38c0b" upstream="master">
     <linkfile dest="Android.bp" src="root.bp" />
     <linkfile dest="bootstrap.bash" src="bootstrap.bash" />
   </project>
-  <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="9a288313be12a0fad6fbb5722e5fada738e0e1fb" upstream="master" />
+  <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="de6ba97efb8eaacaf3f7eb9715b4b9f0cd8cbe19" upstream="master" />
   <!-- toolchain linux prebuilts -->
-  <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="444923dfbf5d94f3eb9206b6de1a2678aed810b9" upstream="master" />
+  <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="9b72e35f15d9353a3d672746bc934c1cb818a578" upstream="master" />
   <project clone-depth="1" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" revision="73ca99196723f810dad42390d154654354f57c16" upstream="master" />
   <project clone-depth="1" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="2519fc4d3dfdd95b72eb5b8d1c46dce107f6482e" upstream="master" />
   <project clone-depth="1" groups="linux" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="6369b19fc3fbe765636af75d394627e2b92599ed" upstream="master" />
   <!-- toolchain darwin prebuilts -->
-  <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="30d1d11bfa97b85ae66e5ae3f9301af6a8d3cddf" upstream="master" />
+  <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="0a26535dda9e4c13557c5193b287f24aec64a88f" upstream="master" />
   <project clone-depth="1" groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="master" />
   <project clone-depth="1" 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 clone-depth="1" groups="darwin" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="f4569973e0735be0aa375d094d6995223b643885" upstream="master" />
   <project clone-depth="1" groups="darwin" name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="00f798346dedb4a7a6a6dcc9ad32ff09d66ee0db" upstream="master" />
   <!-- toolchain windows prebuilts -->
-  <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="72e6af5caae004fbb46b18289f351c0bcc367fc8" upstream="master" />
+  <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="ce841596d2b8f85a26fc1b829308fe09174c409b" upstream="master" />
   <project clone-depth="1" groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="d3566f4f19b660d98ff237825ed775289c102420" upstream="master" />
   <!-- dependency source -->
-  <project name="platform/development" path="development" revision="4809b64dfdc549baf827efdf077825893ea26930" upstream="master" />
+  <project name="platform/development" path="development" revision="1a5b9104fda7685b37c37e020e4f5625e68e628e" upstream="master" />
   <project name="platform/external/clang" path="external/clang" revision="2910a18bf8b63ea2a2cc2c6c8be7e7c05faff66b" upstream="master" />
   <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="8bdaf98eeb4dd0f7b8cae390cd18c097a9eb4e2f" upstream="master" />
-  <project name="platform/external/libcxx" path="external/libcxx" revision="4cef24ee3c034fca86147062e9045b7e9e0dc27f" upstream="master" />
+  <project name="platform/external/libcxx" path="external/libcxx" revision="1e705dad853445419ccc8d35d82de263e91de3f3" upstream="master" />
   <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="c41479a1d7de7fe6e9cfbff9be21382f7b23ace7" upstream="master" />
-  <project name="platform/external/libunwind" path="external/libunwind" revision="5626fc08164caab49af8d133a3c3f81eb24c5ef7" upstream="master" />
-  <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="a756c603bfde97c21afa285b000145c3942142d8" upstream="master" />
-  <project name="platform/external/llvm" path="external/llvm" revision="e0b553c6a8733b0569b9fa228f623da904ff649e" upstream="master" />
-  <project name="platform/external/protobuf" path="external/protobuf" revision="0536f43ba6b04df7c54a11820b206b6c91080e7e" upstream="master" />
-  <project name="platform/external/zlib" path="external/zlib" revision="bac3bcd13c6440d03227a2a7175c47671e241a28" upstream="master" />
+  <project name="platform/external/libunwind" path="external/libunwind" revision="adfc0a1a325ab560f74d404fd833e2661bef7a53" upstream="master" />
+  <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="93d99bf31d081198030380a946f4c29e38159b25" upstream="master" />
+  <project name="platform/external/llvm" path="external/llvm" revision="a564ef3792a3bcb5c69a1e2c4e4c745ae3f9159e" upstream="master" />
+  <project name="platform/external/protobuf" path="external/protobuf" revision="06884d010cc3abbd97861e696cae2c1736679168" upstream="master" />
+  <project name="platform/external/zlib" path="external/zlib" revision="30595680d975bf98dd62e3c25d16562ab33c3d4d" upstream="master" />
   <!-- target projects -->
   <project name="toolchain/go" path="toolchain/go" revision="78749421070cf5a6c02966dccbd9abe801b9340d" upstream="master" />
-  <project name="platform/external/ninja" path="external/ninja" revision="f3eb4f49aec7119e62841566bc88ccbfc2a45d14" upstream="master" />
+  <project name="platform/external/ninja" path="external/ninja" revision="6c7ccd02c0bd367acb3b9743e35d31e05a052894" upstream="master" />
 </manifest>