diff --git a/darwin-x86/bin/aidl b/darwin-x86/bin/aidl
index d7f5ed1..4ebf1c2 100755
--- a/darwin-x86/bin/aidl
+++ b/darwin-x86/bin/aidl
Binary files differ
diff --git a/darwin-x86/bin/bpfmt b/darwin-x86/bin/bpfmt
index d9d91fb..2758207 100755
--- a/darwin-x86/bin/bpfmt
+++ b/darwin-x86/bin/bpfmt
Binary files differ
diff --git a/darwin-x86/bin/ckati b/darwin-x86/bin/ckati
index d35fd2d..c262ef6 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 6c526c0..fdfcd27 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
deleted file mode 100755
index 19d2cd7..0000000
--- a/darwin-x86/bin/header-abi-diff
+++ /dev/null
Binary files differ
diff --git a/darwin-x86/bin/header-abi-dumper b/darwin-x86/bin/header-abi-dumper
deleted file mode 100755
index 1283aa6..0000000
--- a/darwin-x86/bin/header-abi-dumper
+++ /dev/null
Binary files differ
diff --git a/darwin-x86/bin/header-abi-linker b/darwin-x86/bin/header-abi-linker
deleted file mode 100755
index ef0148a..0000000
--- a/darwin-x86/bin/header-abi-linker
+++ /dev/null
Binary files differ
diff --git a/darwin-x86/bin/merge-abi-diff b/darwin-x86/bin/merge-abi-diff
deleted file mode 100755
index 4db1fd8..0000000
--- a/darwin-x86/bin/merge-abi-diff
+++ /dev/null
Binary files differ
diff --git a/darwin-x86/bin/ninja b/darwin-x86/bin/ninja
index 1a0bd8e..a7285c6 100755
--- a/darwin-x86/bin/ninja
+++ b/darwin-x86/bin/ninja
Binary files differ
diff --git a/darwin-x86/bin/soong_zip b/darwin-x86/bin/soong_zip
index 57705d0..75f9f5a 100755
--- a/darwin-x86/bin/soong_zip
+++ b/darwin-x86/bin/soong_zip
Binary files differ
diff --git a/darwin-x86/bin/zip2zip b/darwin-x86/bin/zip2zip
index 17c9f70..73911e4 100755
--- a/darwin-x86/bin/zip2zip
+++ b/darwin-x86/bin/zip2zip
Binary files differ
diff --git a/darwin-x86/lib64/libprotobuf-cpp-full.dylib b/darwin-x86/lib64/libprotobuf-cpp-full.dylib
deleted file mode 100755
index 2d5f1f2..0000000
--- a/darwin-x86/lib64/libprotobuf-cpp-full.dylib
+++ /dev/null
Binary files differ
diff --git a/linux-x86/asan/bin/aidl b/linux-x86/asan/bin/aidl
index 9a92b17..04e1d20 100755
--- a/linux-x86/asan/bin/aidl
+++ b/linux-x86/asan/bin/aidl
Binary files differ
diff --git a/linux-x86/asan/bin/ckati b/linux-x86/asan/bin/ckati
index ed7601f..4f5ce67 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 a8a84a3..18950cd 100755
--- a/linux-x86/asan/bin/ninja
+++ b/linux-x86/asan/bin/ninja
Binary files differ
diff --git a/linux-x86/asan/bin/zipalign b/linux-x86/asan/bin/zipalign
index 926a143..1e81ca7 100755
--- a/linux-x86/asan/bin/zipalign
+++ b/linux-x86/asan/bin/zipalign
Binary files differ
diff --git a/linux-x86/asan/lib64/liblog.so b/linux-x86/asan/lib64/liblog.so
index b1eefcf..08461f4 100755
--- a/linux-x86/asan/lib64/liblog.so
+++ b/linux-x86/asan/lib64/liblog.so
Binary files differ
diff --git a/linux-x86/bin/aidl b/linux-x86/bin/aidl
index d17089f..cfaba69 100755
--- a/linux-x86/bin/aidl
+++ b/linux-x86/bin/aidl
Binary files differ
diff --git a/linux-x86/bin/bpfmt b/linux-x86/bin/bpfmt
index 4c18c85..8239315 100755
--- a/linux-x86/bin/bpfmt
+++ b/linux-x86/bin/bpfmt
Binary files differ
diff --git a/linux-x86/bin/ckati b/linux-x86/bin/ckati
index 63e20d6..a13a4a2 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 53e9010..53cec37 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
deleted file mode 100755
index 8aade0f..0000000
--- a/linux-x86/bin/header-abi-diff
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/header-abi-dumper b/linux-x86/bin/header-abi-dumper
deleted file mode 100755
index 6b934cd..0000000
--- a/linux-x86/bin/header-abi-dumper
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/header-abi-linker b/linux-x86/bin/header-abi-linker
deleted file mode 100755
index 216ab34..0000000
--- a/linux-x86/bin/header-abi-linker
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/merge-abi-diff b/linux-x86/bin/merge-abi-diff
deleted file mode 100755
index b92ed6c..0000000
--- a/linux-x86/bin/merge-abi-diff
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/ninja b/linux-x86/bin/ninja
index 59946a9..5b43ec9 100755
--- a/linux-x86/bin/ninja
+++ b/linux-x86/bin/ninja
Binary files differ
diff --git a/linux-x86/bin/soong_zip b/linux-x86/bin/soong_zip
index cb77328..113fcad 100755
--- a/linux-x86/bin/soong_zip
+++ b/linux-x86/bin/soong_zip
Binary files differ
diff --git a/linux-x86/bin/zip2zip b/linux-x86/bin/zip2zip
index b7a956f..4d9c3c7 100755
--- a/linux-x86/bin/zip2zip
+++ b/linux-x86/bin/zip2zip
Binary files differ
diff --git a/linux-x86/bin/zipalign b/linux-x86/bin/zipalign
index d904e60..c4d3b09 100755
--- a/linux-x86/bin/zipalign
+++ b/linux-x86/bin/zipalign
Binary files differ
diff --git a/linux-x86/lib64/liblog.so b/linux-x86/lib64/liblog.so
index 2b0882d..e7dc44c 100755
--- a/linux-x86/lib64/liblog.so
+++ b/linux-x86/lib64/liblog.so
Binary files differ
diff --git a/linux-x86/lib64/libprotobuf-cpp-full.so b/linux-x86/lib64/libprotobuf-cpp-full.so
deleted file mode 100755
index e60e040..0000000
--- a/linux-x86/lib64/libprotobuf-cpp-full.so
+++ /dev/null
Binary files differ
diff --git a/manifest.xml b/manifest.xml
index 6a57306..8e1e9ca 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -3,18 +3,18 @@
   <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="b9a66a6250117846be11efd75b2e6be04e65e356" upstream="master">
+  <project name="platform/build" path="build/make" revision="5c93279fbe9be5c64d409669572be3dd663223c8" upstream="master">
     <linkfile dest="build/tools" src="tools" />
   </project>
-  <project name="platform/build/blueprint" path="build/blueprint" revision="3aaf722a8d25ed726d4aba5d96bd325afe74a61c" upstream="master" />
-  <project name="platform/build/kati" path="build/kati" revision="0f3785677c3399ba61a958c3b015b632e4d1cc8f" upstream="master" />
-  <project name="platform/build/soong" path="build/soong" revision="2e6a4ff3beaff084082a054c668ec5b6d29ffdf7" upstream="master">
+  <project name="platform/build/blueprint" path="build/blueprint" revision="613013cb824f3464774ebf70367f75e7f83dc0ce" upstream="master" />
+  <project name="platform/build/kati" path="build/kati" revision="ac70a73c816b3a51fe1541ef594f665853662e2f" upstream="master" />
+  <project name="platform/build/soong" path="build/soong" revision="540a78c1ce0519b8085a5f5388474b0a3a4350b1" 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="fe85be0fe4ac5fef3dcdd7a5922a0dca1a215505" upstream="master" />
+  <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="13db9fd267baf97807d1271121837bd6a882670f" 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="162aadd1938471524b639032948793d291516303" upstream="master" />
+  <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="13c8d4e296fa2badce7d0dcabeafd63ff58774ba" 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="2ccb38af8c940f1feef62ff5986f4bbc5d899e66" upstream="master" />
   <project clone-depth="1" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="3c27c3f6c42dbb890c67820f2897812e16f01be1" upstream="master" />
   <project clone-depth="1" groups="linux" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="6369b19fc3fbe765636af75d394627e2b92599ed" upstream="master" />
@@ -28,32 +28,32 @@
   <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="896e7ac095aadddf9fe3d892bab75a89246ab8f6" 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="e76a9a506d7ad132f107eb2f7c27b6a8ccb68b91" upstream="master" />
   <!-- toolchain jdk prebuilts -->
-  <project clone-depth="1" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="636b6973a6918b01c5a21ff397479ab9ecea2306" upstream="master" />
-  <project clone-depth="1" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="bc70fd09a3506b4568113a9844af856219203f66" upstream="master" />
+  <project clone-depth="1" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="9396a3bdcaea77fc7e633b79fad487f76954e90d" upstream="master" />
+  <project clone-depth="1" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="6a4bb48bcf0adfd9caa8d7fbd97318a1c450e1ec" upstream="master" />
   <!-- dependency prebuilts -->
-  <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="a87160614507574b2af3fbe2c9148a7474db2397" upstream="master" />
+  <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="779b68630a2b8d71a0e02e943c83970a77776508" upstream="master" />
   <!-- dependency source -->
-  <project name="platform/development" path="development" revision="86c0968a0507eeaca12cec1dfccbd4bd4c45aa77" upstream="master" />
+  <project name="platform/development" path="development" revision="13a3e2ba6a436a9ab6be0fa89d059fe6e335d130" upstream="master" />
   <project name="platform/external/bison" path="external/bison" revision="e16291bf844ee1ba60abd7ed28a386a1eff425d5" upstream="master" />
-  <project name="platform/external/clang" path="external/clang" revision="0a0aca98bdcb51766a7bbbd071e7dd4ea4ab40cb" upstream="master" />
-  <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="12abeff10335d239f2d5aeaa638d45e2dc28565d" upstream="master" />
+  <project name="platform/external/clang" path="external/clang" revision="4083c7505ffbdec9338f19e1288043efa87b9694" upstream="master" />
+  <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="754fd3d334cf667e65c9642f175326cd07922983" upstream="master" />
   <project name="platform/external/dagger2" path="external/dagger2" revision="aa6a6e2682aed0d5bb483baa37a04357af0ea918" upstream="master" />
   <project name="platform/external/googletest" path="external/googletest" revision="23f59843dbc16e86d0451123c55243c5f3fdbc33" upstream="master" />
   <project name="platform/external/libcxx" path="external/libcxx" revision="02ad8ad9214145f918020b17fb9a0f0d3f86dd46" upstream="master" />
   <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="2eddfdfc541f691d49a425d037aa5d4f32ef22dd" upstream="master" />
   <project name="platform/external/libunwind" path="external/libunwind" revision="41ba0e90f33fe3b5d1467e4fab5e0a709685c0db" upstream="master" />
   <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="9ca0ad7a15a8b9868f22f67d13fe49a2d02601dc" upstream="master" />
-  <project name="platform/external/llvm" path="external/llvm" revision="79c7f5d7a2be0de081031e0ebcd481ab7905854b" upstream="master" />
-  <project name="platform/external/protobuf" path="external/protobuf" revision="a56b371c82caba91f92f8cee1ebf9aae6564ebf5" upstream="master" />
+  <project name="platform/external/llvm" path="external/llvm" revision="ebb0b5abae2699e8a2cc0f0251621fd9ee57e7a2" upstream="master" />
+  <project name="platform/external/protobuf" path="external/protobuf" revision="a69907a6b287fac8723b742f9a73cd5ec3c98a2d" upstream="master" />
   <project name="platform/external/safe-iop" path="external/safe-iop" revision="4e20417f767dedadd684930ff1517b03751b3af8" upstream="master" />
   <project name="platform/external/zlib" path="external/zlib" revision="0d8ec3aa938b73192a8fd69f9cd1b2568f12c4ed" upstream="master" />
   <project name="platform/external/zopfli" path="external/zopfli" revision="326ac1cbe4782894dd1be564bfcab361ddd4f8f3" upstream="master" />
-  <project name="platform/system/core" path="system/core" revision="851803d3cf3e874bb9305341a681a56cc73e7c57" upstream="master" />
+  <project name="platform/system/core" path="system/core" revision="a281389bf4b52bdbb7430ffec723a23e41606352" upstream="master" />
   <!-- target projects -->
-  <project name="toolchain/go" path="toolchain/go" revision="fea2d2393bd3da68879fa4eabd8ef663f222d037" upstream="master" />
+  <project name="toolchain/go" path="toolchain/go" revision="f56b377d345d5aa07bb4bec67e467b91b53bd456" upstream="master" />
   <project name="platform/dalvik" path="dalvik" revision="6e979de7e80bdab27a9a396bb7204f0f7d475362" upstream="master" />
   <project name="platform/external/desugar" path="external/desugar" revision="9e1602fcb030f33d2d263acd783a9e24fccb3e7d" upstream="master" />
-  <project name="platform/external/ninja" path="external/ninja" revision="495fcf4b799d84d8727ce0e185950ace29a6ea11" upstream="master" />
+  <project name="platform/external/ninja" path="external/ninja" revision="d62c8866d321809bb77d8337a3db5b0824ac1de0" upstream="master" />
   <project name="platform/external/turbine" path="external/turbine" revision="23c69591372863b9e0166768d37ef0915c38977e" upstream="master" />
-  <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="7fab0d177ad40775155738baad45ab354d90632f" upstream="master" />
+  <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="d2bcf2fea80501be334d15e54d7900b997881293" upstream="master" />
 </manifest>