diff --git a/darwin-x86/bin/aidl b/darwin-x86/bin/aidl
index 5e1a731..97dfee9 100755
--- a/darwin-x86/bin/aidl
+++ b/darwin-x86/bin/aidl
Binary files differ
diff --git a/darwin-x86/bin/bloaty b/darwin-x86/bin/bloaty
index 90e8d43..eb7f511 100755
--- a/darwin-x86/bin/bloaty
+++ b/darwin-x86/bin/bloaty
Binary files differ
diff --git a/darwin-x86/bin/ckati b/darwin-x86/bin/ckati
index a0d1066..784232d 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 1093e9d..69cc703 100755
--- a/darwin-x86/bin/ckati_stamp_dump
+++ b/darwin-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/darwin-x86/bin/gavinhoward-bc b/darwin-x86/bin/gavinhoward-bc
index 8df9961..a2e1d13 100755
--- a/darwin-x86/bin/gavinhoward-bc
+++ b/darwin-x86/bin/gavinhoward-bc
Binary files differ
diff --git a/darwin-x86/bin/hidl-gen b/darwin-x86/bin/hidl-gen
index bbf2293..a97fadf 100755
--- a/darwin-x86/bin/hidl-gen
+++ b/darwin-x86/bin/hidl-gen
Binary files differ
diff --git a/darwin-x86/bin/hidl-lint b/darwin-x86/bin/hidl-lint
index 17125ac..92cb6e6 100755
--- a/darwin-x86/bin/hidl-lint
+++ b/darwin-x86/bin/hidl-lint
Binary files differ
diff --git a/darwin-x86/bin/one-true-awk b/darwin-x86/bin/one-true-awk
index fdffde9..02a92de 100755
--- a/darwin-x86/bin/one-true-awk
+++ b/darwin-x86/bin/one-true-awk
Binary files differ
diff --git a/darwin-x86/bin/py2-cmd b/darwin-x86/bin/py2-cmd
index 944d673..86006ac 100755
--- a/darwin-x86/bin/py2-cmd
+++ b/darwin-x86/bin/py2-cmd
Binary files differ
diff --git a/darwin-x86/bin/soong_zip b/darwin-x86/bin/soong_zip
index 9b22bd1..b248b77 100755
--- a/darwin-x86/bin/soong_zip
+++ b/darwin-x86/bin/soong_zip
Binary files differ
diff --git a/darwin-x86/bin/toybox b/darwin-x86/bin/toybox
index 34a4f8f..c4621f1 100755
--- a/darwin-x86/bin/toybox
+++ b/darwin-x86/bin/toybox
Binary files differ
diff --git a/darwin-x86/bin/zipalign b/darwin-x86/bin/zipalign
index 09a7934..935bed7 100755
--- a/darwin-x86/bin/zipalign
+++ b/darwin-x86/bin/zipalign
Binary files differ
diff --git a/darwin-x86/lib64/libcrypto-host.dylib b/darwin-x86/lib64/libcrypto-host.dylib
index 0325b09..066d2bb 100755
--- a/darwin-x86/lib64/libcrypto-host.dylib
+++ b/darwin-x86/lib64/libcrypto-host.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libziparchive.dylib b/darwin-x86/lib64/libziparchive.dylib
index dc402a1..8bf880e 100755
--- a/darwin-x86/lib64/libziparchive.dylib
+++ b/darwin-x86/lib64/libziparchive.dylib
Binary files differ
diff --git a/linux-x86/asan/bin/aidl b/linux-x86/asan/bin/aidl
index 4ed7260..685576a 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 8d58a6e..f10372d 100755
--- a/linux-x86/asan/bin/ckati
+++ b/linux-x86/asan/bin/ckati
Binary files differ
diff --git a/linux-x86/asan/bin/gavinhoward-bc b/linux-x86/asan/bin/gavinhoward-bc
index a7f60e3..cf97caf 100755
--- a/linux-x86/asan/bin/gavinhoward-bc
+++ b/linux-x86/asan/bin/gavinhoward-bc
Binary files differ
diff --git a/linux-x86/asan/bin/toybox b/linux-x86/asan/bin/toybox
index 81445b6..90d908c 100755
--- a/linux-x86/asan/bin/toybox
+++ b/linux-x86/asan/bin/toybox
Binary files differ
diff --git a/linux-x86/asan/bin/zipalign b/linux-x86/asan/bin/zipalign
index e98e664..1c1adeb 100755
--- a/linux-x86/asan/bin/zipalign
+++ b/linux-x86/asan/bin/zipalign
Binary files differ
diff --git a/linux-x86/asan/lib64/libcrypto-host.so b/linux-x86/asan/lib64/libcrypto-host.so
index 732b751..5c5da3c 100755
--- a/linux-x86/asan/lib64/libcrypto-host.so
+++ b/linux-x86/asan/lib64/libcrypto-host.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libziparchive.so b/linux-x86/asan/lib64/libziparchive.so
index 152e34e..5448a4a 100755
--- a/linux-x86/asan/lib64/libziparchive.so
+++ b/linux-x86/asan/lib64/libziparchive.so
Binary files differ
diff --git a/linux-x86/bin/aidl b/linux-x86/bin/aidl
index 77eaaf7..43cf835 100755
--- a/linux-x86/bin/aidl
+++ b/linux-x86/bin/aidl
Binary files differ
diff --git a/linux-x86/bin/bloaty b/linux-x86/bin/bloaty
index 8cbe8a4..e547531 100755
--- a/linux-x86/bin/bloaty
+++ b/linux-x86/bin/bloaty
Binary files differ
diff --git a/linux-x86/bin/ckati b/linux-x86/bin/ckati
index 2b37517..37972da 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 dfc2ab3..38b6f95 100755
--- a/linux-x86/bin/ckati_stamp_dump
+++ b/linux-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/linux-x86/bin/gavinhoward-bc b/linux-x86/bin/gavinhoward-bc
index 5fc7d55..744ced8 100755
--- a/linux-x86/bin/gavinhoward-bc
+++ b/linux-x86/bin/gavinhoward-bc
Binary files differ
diff --git a/linux-x86/bin/hidl-gen b/linux-x86/bin/hidl-gen
index a6df209..374f749 100755
--- a/linux-x86/bin/hidl-gen
+++ b/linux-x86/bin/hidl-gen
Binary files differ
diff --git a/linux-x86/bin/hidl-lint b/linux-x86/bin/hidl-lint
index 91f7fa1..1723e19 100755
--- a/linux-x86/bin/hidl-lint
+++ b/linux-x86/bin/hidl-lint
Binary files differ
diff --git a/linux-x86/bin/one-true-awk b/linux-x86/bin/one-true-awk
index e907043..de8579a 100755
--- a/linux-x86/bin/one-true-awk
+++ b/linux-x86/bin/one-true-awk
Binary files differ
diff --git a/linux-x86/bin/py2-cmd b/linux-x86/bin/py2-cmd
index 8f7573c..81d19a3 100755
--- a/linux-x86/bin/py2-cmd
+++ b/linux-x86/bin/py2-cmd
Binary files differ
diff --git a/linux-x86/bin/soong_zip b/linux-x86/bin/soong_zip
index 9a0fda5..d293eb0 100755
--- a/linux-x86/bin/soong_zip
+++ b/linux-x86/bin/soong_zip
Binary files differ
diff --git a/linux-x86/bin/toybox b/linux-x86/bin/toybox
index ee5f865..b5ec930 100755
--- a/linux-x86/bin/toybox
+++ b/linux-x86/bin/toybox
Binary files differ
diff --git a/linux-x86/bin/zipalign b/linux-x86/bin/zipalign
index a03ca6e..40cd46e 100755
--- a/linux-x86/bin/zipalign
+++ b/linux-x86/bin/zipalign
Binary files differ
diff --git a/linux-x86/lib64/libcrypto-host.so b/linux-x86/lib64/libcrypto-host.so
index 6681454..cf8102f 100755
--- a/linux-x86/lib64/libcrypto-host.so
+++ b/linux-x86/lib64/libcrypto-host.so
Binary files differ
diff --git a/linux-x86/lib64/libziparchive.so b/linux-x86/lib64/libziparchive.so
index a532aa7..0c3f90f 100755
--- a/linux-x86/lib64/libziparchive.so
+++ b/linux-x86/lib64/libziparchive.so
Binary files differ
diff --git a/manifest.xml b/manifest.xml
index 5fd20b0..9bc3810 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,209 +1,209 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
 <manifest>
-  <remote fetch="https://android-review.googlesource.com/" name="aosp" review="https://android-review.googlesource.com/" />
+  <remote name="aosp" fetch="https://android-review.googlesource.com/" review="https://android-review.googlesource.com/" />
 
-  <default remote="aosp" revision="build-tools-release" />
+  <default revision="build-tools-release" remote="aosp" />
 
-  <project clone-depth="1" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" revision="31ea3e8cffa4302435acd28b32de36bdd960ce27" />
+  <project name="platform/build" path="build/make" revision="8835ea8fc33a377337dc2e0ff3fe912dfc93754b">
+    <linkfile dest="build/tools" src="tools" />
+</project>
 
-  <project name="platform/external/ninja" path="external/ninja" revision="d264d658aceea4de8a709dae40b47678c8bae284" />
+  <project name="platform/build/blueprint" path="build/blueprint" revision="7bcb5cababe5339b86756711b22a71dabc0b4541" />
 
-  <project clone-depth="1" groups="pdk" name="platform/prebuilts/remoteexecution-client" path="prebuilts/remoteexecution-client" revision="07b33e4b5ee481a76560b6be3ed64d817e56d20b" />
-
-  <project name="platform/system/unwinding" path="system/unwinding" revision="780b9d9f06e8d151ae47f00976e96385e0edd22e" />
-
-  <project name="platform/external/icu" path="external/icu" revision="9989ee7d3565482da358aea86f5ea46ad595f4ce" />
-
-  <project clone-depth="1" 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="7144bd5fe5db7f470563c34e4f0ac6ab5703f926" />
-
-  <project name="platform/external/go-cmp" path="external/go-cmp" revision="0f7c828c80e325c9fc2af078ffb108362bb84c15" />
-
-  <project name="platform/system/libbase" path="system/libbase" revision="6e51de4672e3ac51123d755d353a9dbee2a57af4" />
-
-  <project name="platform/external/javapoet" path="external/javapoet" revision="137745472179f2170a58ec914cdad78921fc7679" />
-
-  <project name="platform/external/capstone" path="external/capstone" revision="63bfcadf03cd1e0d6a98fe7a4cee189063668162" />
-
-  <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="2861af10fad0eb5c9545e0d40330c8a5a4bc0680" />
-
-  <project name="platform/external/pcre" path="external/pcre" revision="562bd8cec0877100592737615b8b9b68604bdfa2" />
-
-  <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="fd8f32ef796b635d666a89c0da8688e05ae27e4a" />
-
-  <project name="toolchain/make" revision="3a78e1257ef0f0f57b12e869fc55bf02b39f9a08" />
-
-  <project name="platform/system/core" path="system/core" revision="931c07707d577f5aa44b6e3d91352aa296c6873c" />
-
-  <project clone-depth="1" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" revision="3fd56285d7a417b8d265612687666d295d065525" />
-
-  <project name="platform/external/guava" path="external/guava" revision="bee38a1aee119cad4801d0ca2f8eaec9560e7b9a" />
-
-  <project clone-depth="1" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" revision="ef456f0d6bedbaa2fd76ee83231b76a9ae68d197" />
-
-  <project name="platform/external/golang-protobuf" path="external/golang-protobuf" revision="8deccff4ef7a79922cd4236d7cd81dfecd7fb418" />
-
-  <project clone-depth="1" groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" />
-
-  <project name="toolchain/xz" revision="e953aba95e0060876d5969cc9322cf2dbb5e2cf5" />
-
-  <project name="toolchain/go" revision="e30168b96922b220e97fbdaee6ed44c86de4ec21" />
-
-  <project name="platform/external/bzip2" path="external/bzip2" revision="7821e22a03be5f9b076e4eb54125dc587efa3e3a" />
-
-  <project name="platform/build/soong" path="build/soong" revision="c81560e6fa0db3e97d538eb3ce77cbfed377075d">
+  <project name="platform/build/soong" path="build/soong" revision="3d43e657897365328ee941b7c133588d139e5f05">
     <linkfile dest="Android.bp" src="root.bp" />
 
     <linkfile dest="bootstrap.bash" src="bootstrap.bash" />
 </project>
 
-  <project name="platform/external/desugar" path="external/desugar" revision="cae6456e4100b910b90d020e167b99b455f3f0e8" />
+  <project name="platform/external/golang-protobuf" path="external/golang-protobuf" revision="8deccff4ef7a79922cd4236d7cd81dfecd7fb418" />
 
-  <project name="platform/external/googleapis" path="external/googleapis" revision="cf713bac0768fa14bad9fd1a537f8529fc8a7911" />
+  <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="9fb4195960b82b33cc7fd62d5a399101167935bf" />
 
-  <project name="platform/external/escapevelocity" path="external/escapevelocity" revision="bdd875cc12e1c7f46bbeb5fea05d0fdb5d07b1dc" />
+  <project clone-depth="1" groups="pdk" name="platform/prebuilts/remoteexecution-client" path="prebuilts/remoteexecution-client" revision="33837039d46a0177fbc29579553bcf18555876f6" />
 
-  <project name="platform/external/auto" path="external/auto" revision="c788b8996aff634970708cd5e149c95722c67b49" />
-
-  <project clone-depth="1" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="e017cedfb79dc1ded3fa4de9315094023602e1be" />
-
-  <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="da279e86f8b0736ab58d0cab58cef9d65404fc1c" />
-
-  <project name="platform/external/boringssl" path="external/boringssl" revision="064f894ab4dd1b045cd68f30b2806dc2bab66bef" />
-
-  <project clone-depth="1" groups="linux" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="6369b19fc3fbe765636af75d394627e2b92599ed" />
-
-  <project name="platform/external/openssl" path="external/openssl" revision="a7efb4208fa440335e4c13c57ac30fcc5611a961" />
-
-  <project name="platform/external/toybox" path="external/toybox" revision="a427a44ce95f076ec2d98d73c9007de3c56f178f" />
-
-  <project name="platform/external/golang-x-sync" path="external/golang-x-sync" revision="e43247afef776e3507532a21ade3cce758b96226" />
-
-  <project clone-depth="1" groups="darwin" name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="00f798346dedb4a7a6a6dcc9ad32ff09d66ee0db" />
-
-  <project clone-depth="1" name="platform/external/error_prone" path="external/error_prone" revision="2c386e73c03b24e0a1ae27b314c7269299f5227b" />
-
-  <project name="platform/external/jsr305" path="external/jsr305" revision="1a3f97731c0ce0cabb2afaf7fa4690bf4391cd6a" />
-
-  <project name="platform/external/nsjail" path="external/nsjail" revision="a25cd900710305660a653c6b63d76286d8d6cdfe" />
-
-  <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="fd9d3247e852f9d6601fdb0e1877bf5e9cbe52cd" />
-
-  <project name="platform/external/bloaty" path="external/bloaty" revision="ea2e752ffec4b095800be4ff9d8bed5f56f57ca8" />
-
-  <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="34b9e5578f99a11691696f955cc182b6e97d9a3a" />
-
-  <project name="platform/external/python/cpython3" path="external/python/cpython3" revision="d7f9938c94658cf3a2344c4252d56cd158c79a3c" />
-
-  <project name="platform/build/blueprint" path="build/blueprint" revision="b8d520adda284f79e1805517207b9d14f7fe4b23" />
-
-  <project name="platform/external/safe-iop" path="external/safe-iop" revision="b805514f31a231a0e78a18f296c0454fcadead1a" />
-
-  <project name="platform/external/llvm" path="external/llvm" revision="fea7a439296839204ac87aeb96c6072ef58df73b" />
-
-  <project name="platform/external/bison" path="external/bison" revision="1519c8770cf104cf870388e25e767813f3301cf4" />
-
-  <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="36c3c89f987bec3c3c77fb2aeee7422bc3f9d3c3" />
-
-  <project name="platform/external/go-subcommands" path="external/go-subcommands" revision="409adebbdb103fb745f56343d7345b57c8ea13aa" />
-
-  <project name="platform/external/google-java-format" path="external/google-java-format" revision="1ca4667c34a45fb6663b6fa277a909b8049849d4" />
+  <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="5355b350c54bb10bde14b1e9606c7280f53349d9" />
 
   <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="d9aafaade740ca38612c742f6d87debf362132ea" />
 
-  <project name="platform/external/bc" path="external/bc" revision="1fc938c2b4bc6a72707a10af8533edd7b81b9df5" />
+  <project clone-depth="1" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" revision="31ea3e8cffa4302435acd28b32de36bdd960ce27" />
 
-  <project name="platform/external/one-true-awk" path="external/one-true-awk" revision="d4dfc80d62932b8a4cb6e58f8ca1a52df1f68066" />
+  <project clone-depth="1" 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="7144bd5fe5db7f470563c34e4f0ac6ab5703f926" />
 
-  <project name="platform/external/python/cpython2" path="external/python/cpython2" revision="d71f5bb9554c384bd45dd0e5911b3be50e4f9a5e" />
+  <project clone-depth="1" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="e017cedfb79dc1ded3fa4de9315094023602e1be" />
 
-  <project name="platform/external/jsoncpp" path="external/jsoncpp" revision="03436c0deb0308086089d98e8fac79f5fdc04806" />
+  <project clone-depth="1" groups="linux" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="6369b19fc3fbe765636af75d394627e2b92599ed" />
 
-  <project name="platform/external/sqlite" path="external/sqlite" revision="4a579c323a0521ab897d34934da043955d0c6b7a" />
+  <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="c0f32327a6233b9b7474cc70000f539502629002" />
 
-  <project name="platform/bionic" path="bionic" revision="8f80d379639fc3134b5eca83dae1ad05bb036c36" />
+  <project clone-depth="1" groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" />
 
-  <project name="platform/external/golang-x-tools" path="external/golang-x-tools" revision="bcc6484babb4e999e4bdb6a982bfa7e92fc640d2" />
+  <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="34b9e5578f99a11691696f955cc182b6e97d9a3a" />
 
-  <project name="platform/external/clang" path="external/clang" revision="f22cbcfacc6f04755ab2a61e9b3b1329b5d606a3" />
+  <project clone-depth="1" groups="darwin" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="a06a70ee88e1321ddb98316f419b6072150bf221" />
 
-  <project clone-depth="1" name="platform/prebuilts/jdk/jdk11" path="prebuilts/jdk/jdk11" revision="7d61a59c743128a64f678da5104ab821bdc6270e" />
-
-  <project name="platform/external/libcxx" path="external/libcxx" revision="7a70fca0dacae7efbcd3329c7f828e0735aa092e" />
-
-  <project name="platform/system/libziparchive" path="system/libziparchive" revision="9858cf8426b468576714ffa578d630419a7235a1" />
-
-  <project name="toolchain/m4" revision="e0fa9d57f818d550ccef84d1520923f2a942f5ba" />
-
-  <project name="platform/external/expat" path="external/expat" revision="e3689675b0157542ae4f70690d71bd3996ccb34c" />
-
-  <project name="platform/system/libhwbinder" path="system/libhwbinder" revision="30e1061ca859942e9be5d0373d36c782e7491904" />
-
-  <project name="platform/external/turbine" path="external/turbine" revision="bf096fd0b66c4b2863c71bbb11b6de4c5e88806d" />
-
-  <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="bf08053df3ce76939a4282a282e13a6d1fe134bf" />
-
-  <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="54ed55f04191810e5e92cd9ef675b71483c398c3" />
-
-  <project name="platform/build" path="build/make" revision="e67bb6a48d693aa7c95c1c833d3bbb360dd10476">
-    <linkfile dest="build/tools" src="tools" />
-</project>
-
-  <project name="platform/external/arm-optimized-routines" path="external/arm-optimized-routines" revision="f2eccaab723a34f695a9c1d82b1a75073a34ddaa" />
-
-  <project name="platform/dalvik" path="dalvik" revision="6548942adec11574803a9ac3955a50c6ee974606" />
-
-  <project name="platform/external/go-creachadair-stringset" path="external/go-creachadair-stringset" revision="580fe893c0cd9bc1cb41a735b6ff456901f00e83" />
-
-  <project name="platform/external/selinux" path="external/selinux" revision="b5e8e187493b8898307f902ababdc4ec080a9d33" />
-
-  <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="9d79b41052fd2f9541d35735257a43ce3c0f8487" />
-
-  <project name="platform/external/flex" path="external/flex" revision="e058c910354051d00ffa40f58df150a105fd31cb" />
-
-  <project name="platform/external/googletest" path="external/googletest" revision="e1f35040857fe3112cac00c299fe01842a422b19" />
-
-  <project name="platform/external/zlib" path="external/zlib" revision="07c8631a88d7c0b1713398efb3984cd7b9923005" />
-
-  <project name="platform/external/zopfli" path="external/zopfli" revision="51ea3d41bea54b0735b0e5c72421de6aa9cb8b28" />
+  <project clone-depth="1" groups="darwin" name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="00f798346dedb4a7a6a6dcc9ad32ff09d66ee0db" />
 
   <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="3c549b0d72457aaca650f9b6081efabd98293231" />
 
-  <project name="platform/external/kythe" path="external/kythe" revision="de7e2fbaab0f29c2a69db22df15d48b72aad8180" />
+  <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="0567772fc56a29c781934dd67d430ffc38d8d73d" />
 
-  <project name="platform/external/dagger2" path="external/dagger2" revision="7093e5117e929aaca22f0f9f417f730717fb3fe2" />
-
-  <project name="platform/build/kati" path="build/kati" revision="2cded7e906446249ea19a093fe1b85c685db8214" />
-
-  <project name="platform/system/logging" path="system/logging" revision="c9fa49879949bb6208fc3874f4da1e3df4f84df2" />
-
-  <project name="platform/external/protobuf" path="external/protobuf" revision="0a41c8929852545941522cf2999eda58d1aba793" />
-
-  <project name="platform/external/jemalloc" path="external/jemalloc" revision="0c83f48fb28ecc5d4946396865dba43d583e792d" />
-
-  <project name="platform/development" path="development" revision="0f9420e94d22ae303a3054c2b872bec7a59b535f" />
-
-  <project name="platform/external/libffi" path="external/libffi" revision="12d65dc2117aabe13e69052bd9bdc4401cd8edca" />
-
-  <project name="platform/external/go-etree" path="external/go-etree" revision="7fa46d9c9eb9134443a7fc56a354f07b15fc3a76" />
-
-  <project name="platform/external/go-creachadair-shell" path="external/go-creachadair-shell" revision="97d772a0b6c62d6bfac71224c4fdbf896a5478ba" />
-
-  <project name="platform/external/fmtlib" path="external/fmtlib" revision="4c96ef1743bb42362739d984e71bfe5505c777ee" />
-
-  <project name="platform/system/tools/hidl" path="system/tools/hidl" revision="d754338cf0dc61b357bf6b1d8fef6287adb6968d" />
-
-  <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="337713f2598060e6af7dfddd2c55d6e41138b8e4" />
-
-  <project name="platform/external/bazelbuild-remote-apis" path="external/bazelbuild-remote-apis" revision="e0e5a5351a4571f63506eec04ee49a3dd1e60327" />
-
-  <project name="platform/external/libunwind" path="external/libunwind" revision="59d5821a2be78a77f1de986df868692d498b2d1b" />
+  <project clone-depth="1" name="platform/prebuilts/jdk/jdk11" path="prebuilts/jdk/jdk11" revision="7d61a59c743128a64f678da5104ab821bdc6270e" />
 
   <project clone-depth="1" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="74e4f1844dfa9b8df9e0fe2ff34a2ecc24d52b07" />
 
   <project clone-depth="1" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="9033a6dad70688a6bf7ee78ed073b7662c5580fe" />
 
+  <project clone-depth="1" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" revision="ef456f0d6bedbaa2fd76ee83231b76a9ae68d197" />
+
+  <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="90235ff15eb3641f1946454259650de990750def" />
+
+  <project clone-depth="1" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" revision="d18c42f200cf687f3df458de796268fe7c7cf5cd" />
+
+  <project name="platform/bionic" path="bionic" revision="3a1c1f7c48d7f7f4a672eb28de42d3c49a2cfa2f" />
+
+  <project name="platform/development" path="development" revision="4b80504aa45f54635085f68b5d5705b1348db364" />
+
+  <project name="platform/external/arm-optimized-routines" path="external/arm-optimized-routines" revision="f2eccaab723a34f695a9c1d82b1a75073a34ddaa" />
+
+  <project name="platform/external/auto" path="external/auto" revision="c788b8996aff634970708cd5e149c95722c67b49" />
+
   <project name="platform/external/abseil-cpp" path="external/abseil-cpp" revision="fd30bf9a4b179e3206c3f3d2c8e54e4b15bd3866" />
 
-  <project clone-depth="1" groups="darwin" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="a06a70ee88e1321ddb98316f419b6072150bf221" />
+  <project name="platform/external/bazelbuild-remote-apis" path="external/bazelbuild-remote-apis" revision="e0e5a5351a4571f63506eec04ee49a3dd1e60327" />
+
+  <project name="platform/external/boringssl" path="external/boringssl" revision="5286a329810436fe323f743155a1bdf06fcbfa32" />
+
+  <project name="platform/external/capstone" path="external/capstone" revision="a0886973da70b44e5707bb8c20420707046ac877" />
+
+  <project name="platform/external/clang" path="external/clang" revision="f22cbcfacc6f04755ab2a61e9b3b1329b5d606a3" />
+
+  <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="bf08053df3ce76939a4282a282e13a6d1fe134bf" />
+
+  <project name="platform/external/dagger2" path="external/dagger2" revision="127fc25647bb3d0082ebf9bd5539975f03f1d706" />
+
+  <project clone-depth="1" name="platform/external/error_prone" path="external/error_prone" revision="2c386e73c03b24e0a1ae27b314c7269299f5227b" />
+
+  <project name="platform/external/escapevelocity" path="external/escapevelocity" revision="bdd875cc12e1c7f46bbeb5fea05d0fdb5d07b1dc" />
+
+  <project name="platform/external/expat" path="external/expat" revision="4e28b878c4ab281a8931bf728d01d96feb338b7f" />
+
+  <project name="platform/external/fmtlib" path="external/fmtlib" revision="4c96ef1743bb42362739d984e71bfe5505c777ee" />
+
+  <project name="platform/external/go-cmp" path="external/go-cmp" revision="0f7c828c80e325c9fc2af078ffb108362bb84c15" />
+
+  <project name="platform/external/go-creachadair-shell" path="external/go-creachadair-shell" revision="97d772a0b6c62d6bfac71224c4fdbf896a5478ba" />
+
+  <project name="platform/external/go-creachadair-stringset" path="external/go-creachadair-stringset" revision="580fe893c0cd9bc1cb41a735b6ff456901f00e83" />
+
+  <project name="platform/external/go-etree" path="external/go-etree" revision="7fa46d9c9eb9134443a7fc56a354f07b15fc3a76" />
+
+  <project name="platform/external/go-subcommands" path="external/go-subcommands" revision="409adebbdb103fb745f56343d7345b57c8ea13aa" />
+
+  <project name="platform/external/golang-x-sync" path="external/golang-x-sync" revision="e43247afef776e3507532a21ade3cce758b96226" />
+
+  <project name="platform/external/golang-x-tools" path="external/golang-x-tools" revision="bcc6484babb4e999e4bdb6a982bfa7e92fc640d2" />
+
+  <project name="platform/external/google-java-format" path="external/google-java-format" revision="1ca4667c34a45fb6663b6fa277a909b8049849d4" />
+
+  <project name="platform/external/googleapis" path="external/googleapis" revision="cf713bac0768fa14bad9fd1a537f8529fc8a7911" />
+
+  <project name="platform/external/googletest" path="external/googletest" revision="e1f35040857fe3112cac00c299fe01842a422b19" />
+
+  <project name="platform/external/guava" path="external/guava" revision="bee38a1aee119cad4801d0ca2f8eaec9560e7b9a" />
+
+  <project name="platform/external/icu" path="external/icu" revision="c5dc2f20c617f8aba8bf18f899f7469b7f05e8c9" />
+
+  <project name="platform/external/javapoet" path="external/javapoet" revision="137745472179f2170a58ec914cdad78921fc7679" />
+
+  <project name="platform/external/jemalloc" path="external/jemalloc" revision="0c83f48fb28ecc5d4946396865dba43d583e792d" />
+
+  <project name="platform/external/jsoncpp" path="external/jsoncpp" revision="03436c0deb0308086089d98e8fac79f5fdc04806" />
+
+  <project name="platform/external/jsr305" path="external/jsr305" revision="1a3f97731c0ce0cabb2afaf7fa4690bf4391cd6a" />
+
+  <project name="platform/external/kythe" path="external/kythe" revision="de7e2fbaab0f29c2a69db22df15d48b72aad8180" />
+
+  <project name="platform/external/libcxx" path="external/libcxx" revision="7a70fca0dacae7efbcd3329c7f828e0735aa092e" />
+
+  <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="fd8f32ef796b635d666a89c0da8688e05ae27e4a" />
+
+  <project name="platform/external/libffi" path="external/libffi" revision="02a76e2ceb2f5e46f0e3c8d473b9618e60fa0f9b" />
+
+  <project name="platform/external/libunwind" path="external/libunwind" revision="5ffdf20232a75c6b32edeab5631dbd63f0e5cbe0" />
+
+  <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="54ed55f04191810e5e92cd9ef675b71483c398c3" />
+
+  <project name="platform/external/llvm" path="external/llvm" revision="fea7a439296839204ac87aeb96c6072ef58df73b" />
+
+  <project name="platform/external/pcre" path="external/pcre" revision="562bd8cec0877100592737615b8b9b68604bdfa2" />
+
+  <project name="platform/external/protobuf" path="external/protobuf" revision="8458fbf27212485626d5a711ecf7edf8bbc90d75" />
+
+  <project name="platform/external/safe-iop" path="external/safe-iop" revision="b805514f31a231a0e78a18f296c0454fcadead1a" />
+
+  <project name="platform/external/selinux" path="external/selinux" revision="cd571784a4d456e3b87aa10d7e177fe4fc696f20" />
+
+  <project name="platform/external/sqlite" path="external/sqlite" revision="4a579c323a0521ab897d34934da043955d0c6b7a" />
+
+  <project name="platform/external/zlib" path="external/zlib" revision="1549beb3fa818cc3a00d3a26d9de08444d3c9436" />
+
+  <project name="platform/external/zopfli" path="external/zopfli" revision="a95764f765a033adb07f74c618b3931f3c190e40" />
+
+  <project name="platform/system/core" path="system/core" revision="4990b7d8783fda237c911d57fd108e25e89aa48e" />
+
+  <project name="platform/system/libbase" path="system/libbase" revision="b532ab42c34694585b6a57e1c3d94a386ac5eea7" />
+
+  <project name="platform/system/libhwbinder" path="system/libhwbinder" revision="61adeaa0282d09889ab577337be660566d129096" />
+
+  <project name="platform/system/libziparchive" path="system/libziparchive" revision="41a04ae3d87f98bdb0540fb5d48fd5edb4c80e87" />
+
+  <project name="platform/system/logging" path="system/logging" revision="0e7d6ee25c993a1e6bc8596ec7471477ba58f47a" />
+
+  <project name="platform/system/unwinding" path="system/unwinding" revision="b68bfd4094b5c0138346b8766a73014b72be6b95" />
+
+  <project name="platform/build/kati" path="build/kati" revision="4be94c95165808c449496e75d912427ff4b72745" />
+
+  <project name="platform/dalvik" path="dalvik" revision="6548942adec11574803a9ac3955a50c6ee974606" />
+
+  <project name="platform/external/bc" path="external/bc" revision="44b79cc45f9c0d347aaf12a0ffb10e9e73f87261" />
+
+  <project name="platform/external/bison" path="external/bison" revision="1519c8770cf104cf870388e25e767813f3301cf4" />
+
+  <project name="platform/external/bloaty" path="external/bloaty" revision="4e97ca09798800c00d8887d6b63992669fb1a631" />
+
+  <project name="platform/external/bzip2" path="external/bzip2" revision="99a97d87ff4fda6efb304a75d954998af7ea87b0" />
+
+  <project name="platform/external/desugar" path="external/desugar" revision="cae6456e4100b910b90d020e167b99b455f3f0e8" />
+
+  <project name="platform/external/flex" path="external/flex" revision="e058c910354051d00ffa40f58df150a105fd31cb" />
+
+  <project name="platform/external/ninja" path="external/ninja" revision="d264d658aceea4de8a709dae40b47678c8bae284" />
+
+  <project name="platform/external/nsjail" path="external/nsjail" revision="a25cd900710305660a653c6b63d76286d8d6cdfe" />
+
+  <project name="platform/external/one-true-awk" path="external/one-true-awk" revision="245bcb43a1e032654650f03f81e03d6746b9b923" />
+
+  <project name="platform/external/openssl" path="external/openssl" revision="a7efb4208fa440335e4c13c57ac30fcc5611a961" />
+
+  <project name="platform/external/python/cpython2" path="external/python/cpython2" revision="d71f5bb9554c384bd45dd0e5911b3be50e4f9a5e" />
+
+  <project name="platform/external/python/cpython3" path="external/python/cpython3" revision="eeecd97aea81e0524a21c481d7ccbef38c82de69" />
+
+  <project name="platform/external/toybox" path="external/toybox" revision="d6e304126d7824ec4acafc8f77da5eb4c858fe26" />
+
+  <project name="platform/external/turbine" path="external/turbine" revision="bf096fd0b66c4b2863c71bbb11b6de4c5e88806d" />
+
+  <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="c2dfb947d81ba369d91a42d685ad1e794a32b6ed" />
+
+  <project name="platform/system/tools/hidl" path="system/tools/hidl" revision="40cb34d1590b0bf6113ea17d6871c2aada9b1262" />
+
+  <project name="toolchain/go" revision="e30168b96922b220e97fbdaee6ed44c86de4ec21" />
+
+  <project name="toolchain/m4" revision="e0fa9d57f818d550ccef84d1520923f2a942f5ba" />
+
+  <project name="toolchain/make" revision="3a78e1257ef0f0f57b12e869fc55bf02b39f9a08" />
+
+  <project name="toolchain/xz" revision="e953aba95e0060876d5969cc9322cf2dbb5e2cf5" />
 </manifest>