diff --git a/common/framework/desugar.jar b/common/framework/desugar.jar
index 0f18db1..c9fb36f 100644
--- a/common/framework/desugar.jar
+++ b/common/framework/desugar.jar
Binary files differ
diff --git a/common/framework/dx.jar b/common/framework/dx.jar
index 6e468ce..207956d 100644
--- a/common/framework/dx.jar
+++ b/common/framework/dx.jar
Binary files differ
diff --git a/common/framework/turbine.jar b/common/framework/turbine.jar
index e656bef..30873c6 100644
--- a/common/framework/turbine.jar
+++ b/common/framework/turbine.jar
Binary files differ
diff --git a/darwin-x86/bin/acp b/darwin-x86/bin/acp
index f6e4249..8be606f 100755
--- a/darwin-x86/bin/acp
+++ b/darwin-x86/bin/acp
Binary files differ
diff --git a/darwin-x86/bin/aidl b/darwin-x86/bin/aidl
index f29d7e5..9b5526a 100755
--- a/darwin-x86/bin/aidl
+++ b/darwin-x86/bin/aidl
Binary files differ
diff --git a/darwin-x86/bin/bison b/darwin-x86/bin/bison
index e540881..cef257e 100755
--- a/darwin-x86/bin/bison
+++ b/darwin-x86/bin/bison
Binary files differ
diff --git a/darwin-x86/bin/bpfmt b/darwin-x86/bin/bpfmt
index c816a0b..7037645 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 e3ed04e..6e18918 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 fdfcd27..ae589b7 100755
--- a/darwin-x86/bin/ckati_stamp_dump
+++ b/darwin-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/darwin-x86/bin/flex b/darwin-x86/bin/flex
new file mode 100755
index 0000000..d776266
--- /dev/null
+++ b/darwin-x86/bin/flex
Binary files differ
diff --git a/darwin-x86/bin/makeparallel b/darwin-x86/bin/makeparallel
index 8e5ad65..2adf98b 100755
--- a/darwin-x86/bin/makeparallel
+++ b/darwin-x86/bin/makeparallel
Binary files differ
diff --git a/darwin-x86/bin/ninja b/darwin-x86/bin/ninja
index a7285c6..819a570 100755
--- a/darwin-x86/bin/ninja
+++ b/darwin-x86/bin/ninja
Binary files differ
diff --git a/darwin-x86/bin/xz b/darwin-x86/bin/xz
index c854bc9..1bcbdd8 100755
--- a/darwin-x86/bin/xz
+++ b/darwin-x86/bin/xz
Binary files differ
diff --git a/darwin-x86/bin/zipalign b/darwin-x86/bin/zipalign
index 558c191..2ec0660 100755
--- a/darwin-x86/bin/zipalign
+++ b/darwin-x86/bin/zipalign
Binary files differ
diff --git a/darwin-x86/bin/ziptime b/darwin-x86/bin/ziptime
index 7b6b417..d94d42a 100755
--- a/darwin-x86/bin/ziptime
+++ b/darwin-x86/bin/ziptime
Binary files differ
diff --git a/darwin-x86/lib64/libbase.dylib b/darwin-x86/lib64/libbase.dylib
index e89e5e4..bf34d05 100755
--- a/darwin-x86/lib64/libbase.dylib
+++ b/darwin-x86/lib64/libbase.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libc++.dylib b/darwin-x86/lib64/libc++.dylib
index 7889a16..c496c0f 100755
--- a/darwin-x86/lib64/libc++.dylib
+++ b/darwin-x86/lib64/libc++.dylib
Binary files differ
diff --git a/darwin-x86/lib64/liblog.dylib b/darwin-x86/lib64/liblog.dylib
index 2378087..36ab542 100755
--- a/darwin-x86/lib64/liblog.dylib
+++ b/darwin-x86/lib64/liblog.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libz-host.dylib b/darwin-x86/lib64/libz-host.dylib
index 7ab7d70..f08b79b 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/acp b/linux-x86/asan/bin/acp
index 1aec6c6..f3135d6 100755
--- a/linux-x86/asan/bin/acp
+++ b/linux-x86/asan/bin/acp
Binary files differ
diff --git a/linux-x86/asan/bin/aidl b/linux-x86/asan/bin/aidl
index cdcc6aa..be51ca7 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 d7b8e35..12a5419 100755
--- a/linux-x86/asan/bin/ckati
+++ b/linux-x86/asan/bin/ckati
Binary files differ
diff --git a/linux-x86/asan/bin/makeparallel b/linux-x86/asan/bin/makeparallel
index f285d76..879547b 100755
--- a/linux-x86/asan/bin/makeparallel
+++ b/linux-x86/asan/bin/makeparallel
Binary files differ
diff --git a/linux-x86/asan/bin/ninja b/linux-x86/asan/bin/ninja
index 63cab15..c3047e6 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 92923f0..d9e2a38 100755
--- a/linux-x86/asan/bin/zipalign
+++ b/linux-x86/asan/bin/zipalign
Binary files differ
diff --git a/linux-x86/asan/bin/ziptime b/linux-x86/asan/bin/ziptime
index ed17807..4d3bfcd 100755
--- a/linux-x86/asan/bin/ziptime
+++ b/linux-x86/asan/bin/ziptime
Binary files differ
diff --git a/linux-x86/asan/lib64/libbase.so b/linux-x86/asan/lib64/libbase.so
index c20a5c1..f1c809e 100755
--- a/linux-x86/asan/lib64/libbase.so
+++ b/linux-x86/asan/lib64/libbase.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libc++.so b/linux-x86/asan/lib64/libc++.so
index 91103b9..a520040 100755
--- a/linux-x86/asan/lib64/libc++.so
+++ b/linux-x86/asan/lib64/libc++.so
Binary files differ
diff --git a/linux-x86/asan/lib64/liblog.so b/linux-x86/asan/lib64/liblog.so
index 57b6a41..f6e67c4 100755
--- a/linux-x86/asan/lib64/liblog.so
+++ b/linux-x86/asan/lib64/liblog.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libz-host.so b/linux-x86/asan/lib64/libz-host.so
index 68c618a..c30210d 100755
--- a/linux-x86/asan/lib64/libz-host.so
+++ b/linux-x86/asan/lib64/libz-host.so
Binary files differ
diff --git a/linux-x86/bin/acp b/linux-x86/bin/acp
index 94aa6f8..9c0fcd5 100755
--- a/linux-x86/bin/acp
+++ b/linux-x86/bin/acp
Binary files differ
diff --git a/linux-x86/bin/aidl b/linux-x86/bin/aidl
index 4979849..3403894 100755
--- a/linux-x86/bin/aidl
+++ b/linux-x86/bin/aidl
Binary files differ
diff --git a/linux-x86/bin/bison b/linux-x86/bin/bison
index fde1a64..4b7feb3 100755
--- a/linux-x86/bin/bison
+++ b/linux-x86/bin/bison
Binary files differ
diff --git a/linux-x86/bin/bpfmt b/linux-x86/bin/bpfmt
index 3081f2d..fb540ee 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 49e9fc0..b4ea327 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 e2d394c..40fc324 100755
--- a/linux-x86/bin/ckati_stamp_dump
+++ b/linux-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/linux-x86/bin/flex b/linux-x86/bin/flex
new file mode 100755
index 0000000..4e5fdfb
--- /dev/null
+++ b/linux-x86/bin/flex
Binary files differ
diff --git a/linux-x86/bin/makeparallel b/linux-x86/bin/makeparallel
index 194c8d9..ca626fb 100755
--- a/linux-x86/bin/makeparallel
+++ b/linux-x86/bin/makeparallel
Binary files differ
diff --git a/linux-x86/bin/ninja b/linux-x86/bin/ninja
index 445b703..142565c 100755
--- a/linux-x86/bin/ninja
+++ b/linux-x86/bin/ninja
Binary files differ
diff --git a/linux-x86/bin/xz b/linux-x86/bin/xz
index ae053fc..b29237c 100755
--- a/linux-x86/bin/xz
+++ b/linux-x86/bin/xz
Binary files differ
diff --git a/linux-x86/bin/zipalign b/linux-x86/bin/zipalign
index 9ac6df6..e4e9704 100755
--- a/linux-x86/bin/zipalign
+++ b/linux-x86/bin/zipalign
Binary files differ
diff --git a/linux-x86/bin/ziptime b/linux-x86/bin/ziptime
index 64e60dc..4bef0a3 100755
--- a/linux-x86/bin/ziptime
+++ b/linux-x86/bin/ziptime
Binary files differ
diff --git a/linux-x86/lib64/libbase.so b/linux-x86/lib64/libbase.so
index d5cc1ac..b5d79ec 100755
--- a/linux-x86/lib64/libbase.so
+++ b/linux-x86/lib64/libbase.so
Binary files differ
diff --git a/linux-x86/lib64/libc++.so b/linux-x86/lib64/libc++.so
index 106c7ee..9c4bb3d 100755
--- a/linux-x86/lib64/libc++.so
+++ b/linux-x86/lib64/libc++.so
Binary files differ
diff --git a/linux-x86/lib64/liblog.so b/linux-x86/lib64/liblog.so
index e07d4b2..8d82663 100755
--- a/linux-x86/lib64/liblog.so
+++ b/linux-x86/lib64/liblog.so
Binary files differ
diff --git a/linux-x86/lib64/libz-host.so b/linux-x86/lib64/libz-host.so
index e55759d..d0d8306 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 7c87994..328b68b 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -3,58 +3,59 @@
   <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="d29f3e7026148b8b79b222d02c4b4d7390f8e430" upstream="master">
+  <project name="platform/build" path="build/make" revision="e56adeffefbf7b61f7adc8642fd77d9c91c46972" upstream="master">
     <linkfile dest="build/tools" src="tools" />
   </project>
-  <project name="platform/build/blueprint" path="build/blueprint" revision="db06ccbfa9d2c9470531b96f35201fdf1d5f0256" upstream="master" />
+  <project name="platform/build/blueprint" path="build/blueprint" revision="19f04d9938c508b0405df51037e2a16ac688dc40" upstream="master" />
   <project name="platform/build/kati" path="build/kati" revision="ac70a73c816b3a51fe1541ef594f665853662e2f" upstream="master" />
-  <project name="platform/build/soong" path="build/soong" revision="8aed42c798419bb66bfc5214aaa8d0ce8d125958" upstream="master">
+  <project name="platform/build/soong" path="build/soong" revision="78a01965d077fef952a228ab4a9a0cd1cb51670a" 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="9672d7aac26f2c860d93d6a13c339483fd0419cc" upstream="master" />
+  <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="77ad4b9a9e071a7a4e89a8bd8228ad2aa0f4868f" 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="e2bae7e80be5e05067900d378ae1b755e06a7475" upstream="master" />
+  <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="ef590940468a55dff96f7365a36301106f0df9fb" 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="e1b3b188ff03c41213dca621c46c39702d79f3ee" 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="630ba022bb05e9927c2526cd4a41e7fdc7df52f9" upstream="master" />
+  <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="3d584f6fc954ca4bec38ad41d91f9a3baacc9825" 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="a3223285a951ddaebff74a59ea17039313eb9d16" 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="17d3d4b7ae1f66117b8e16b665d326f2e89be66e" 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" />
+  <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="c5b372cd24faa8ecc59fd7df88e79a7351303d30" 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="1bde9c3b14f3a3b081ada6e32da9f2870671b46f" upstream="master" />
   <!-- toolchain jdk prebuilts -->
   <project clone-depth="1" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="bb7dab15c8f2839694a4ced717ea2102e9a5b2a1" upstream="master" />
-  <project clone-depth="1" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="6573cf1d8246d83cd1ca41424605824fcc43e5cd" upstream="master" />
+  <project clone-depth="1" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="da9ddf9c4de6bd6224639ac79ed735204d153c67" upstream="master" />
   <!-- dependency prebuilts -->
-  <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="779b68630a2b8d71a0e02e943c83970a77776508" upstream="master" />
+  <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="a7493439dc0f3743e6a31b02f94de0b78102ec34" upstream="master" />
   <!-- dependency source -->
-  <project name="platform/development" path="development" revision="165477b8179f3e4e143ffc794b9622c4f05c96b3" upstream="master" />
+  <project name="platform/development" path="development" revision="826e268c59b569c5bc02d12342740c2881019214" upstream="master" />
   <project name="platform/external/bison" path="external/bison" revision="e16291bf844ee1ba60abd7ed28a386a1eff425d5" 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/compiler-rt" path="external/compiler-rt" revision="b15c2d44ddcf3c19ea6d33e29d9089b50ed05320" upstream="master" />
   <project name="platform/external/dagger2" path="external/dagger2" revision="aa6a6e2682aed0d5bb483baa37a04357af0ea918" upstream="master" />
+  <project name="platform/external/flex" path="external/flex" revision="f7ef90467cb960cee378cce41238418809c86329" 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/libcxx" path="external/libcxx" revision="bfb1424a250f9a28c9a6033bd6c7f62579e7228d" upstream="master" />
+  <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="1607e38f339e32d6bcf7bb02531d3bf19f42f5c0" upstream="master" />
+  <project name="platform/external/libunwind" path="external/libunwind" revision="91b43a4dfe8239a38434d6d4a1f272139b915896" upstream="master" />
+  <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="2dd29ac655fd62d8ba81208a6d14fd16cfcbbc0c" upstream="master" />
   <project name="platform/external/llvm" path="external/llvm" revision="ebb0b5abae2699e8a2cc0f0251621fd9ee57e7a2" upstream="master" />
-  <project name="platform/external/protobuf" path="external/protobuf" revision="022ab7e7c97b85ca391cda205b50fbedd16bd7ab" 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/protobuf" path="external/protobuf" revision="3146aa7630073c1a303e0cb131a8bf2ae70340c0" upstream="master" />
+  <project name="platform/external/safe-iop" path="external/safe-iop" revision="9dc8fe3aa09da8045101321c0982c77b45eb2e4d" upstream="master" />
+  <project name="platform/external/zlib" path="external/zlib" revision="880f6e994261dc925dcdb4612c65aab03b92afeb" upstream="master" />
   <project name="platform/external/zopfli" path="external/zopfli" revision="326ac1cbe4782894dd1be564bfcab361ddd4f8f3" upstream="master" />
-  <project name="platform/system/core" path="system/core" revision="d457091c3dd3cf1fc9f539a5d6e091fbfced5806" upstream="master" />
+  <project name="platform/system/core" path="system/core" revision="39cab7cd2538b0f31b3672c71195c47ba3b00de9" upstream="master" />
   <!-- target projects -->
   <project name="toolchain/go" path="toolchain/go" revision="f56b377d345d5aa07bb4bec67e467b91b53bd456" upstream="master" />
   <project name="toolchain/xz" path="toolchain/xz" revision="1eba63ef29b17b43e7e2c6968207bd171b73f485" 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="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="d2bcf2fea80501be334d15e54d7900b997881293" upstream="master" />
+  <project name="platform/dalvik" path="dalvik" revision="2e9d6011fe4f4d2e8c065210d0118e7b9d9f305c" upstream="master" />
+  <project name="platform/external/desugar" path="external/desugar" revision="9d2aa110047c892318c506d8ca5db6e7e14f9189" upstream="master" />
+  <project name="platform/external/ninja" path="external/ninja" revision="3b797bbd0bb74402f9ff170553355403753e1fd0" upstream="master" />
+  <project name="platform/external/turbine" path="external/turbine" revision="5081441ed92b73dacbbf1a33f95a1495f0e831ec" upstream="master" />
+  <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="f1b50780ce96c916802e11de10334627f529a728" upstream="master" />
 </manifest>