diff --git a/booting-pinned-manifest.xml b/booting-pinned-manifest.xml
index 4dc2c1f..5671caf 100644
--- a/booting-pinned-manifest.xml
+++ b/booting-pinned-manifest.xml
@@ -7,66 +7,66 @@
   
   <manifest-server url="http://android-smartsync.corp.google.com/android.googlesource.com/manifestserver"/>
   
-  <project dest-branch="master" groups="default" name="device-xiaomi-beryllium" path="device/xiaomi/beryllium" remote="github" revision="9fb386ef15f32c480dbb0571ba69fb269b6ac25c" upstream="master"/>
-  <project dest-branch="master" groups="device,yukawa,pdk" name="device/amlogic/yukawa" revision="f0ffcb6f8c6e2b1b017bfd85f7ee02683a3d6c72" upstream="master"/>
-  <project clone-depth="2" dest-branch="master" groups="device,yukawa,pdk" name="device/amlogic/yukawa-kernel" revision="ffcda4d7613302ef7c25f801d66e3447c8672c63" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk" name="device/common" revision="7cc154a9e8dd6b710c9174532751c46419b532d0" upstream="master"/>
+  <project dest-branch="master" groups="default" name="device-xiaomi-beryllium" path="device/xiaomi/beryllium" remote="github" revision="4d30bdd2adcb40715608e58b8ba97c85eb0097c4" upstream="master"/>
+  <project dest-branch="master" groups="device,yukawa,pdk" name="device/amlogic/yukawa" revision="e9501ced9a98c9f8097654cb6e8f9089d6c9c5f3" upstream="master"/>
+  <project clone-depth="2" dest-branch="master" groups="device,yukawa,pdk" name="device/amlogic/yukawa-kernel" revision="9bb963db665a0da621f5e9fabcdda4d86d417014" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk" name="device/common" revision="fc5501469b4dae405cfa57f8079ad27d485e11b5" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="device/generic/arm64" revision="a46ed223a7f153dd20fbcaeda109d426d085dbe8" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="device/generic/armv7-a-neon" revision="d5115091539779ab9fa4d4247c89d43cbb20dbbe" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="device/generic/art" revision="c182b2e5fe356fb21c9a8b461f7f19f9a9702794" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="device/generic/car" revision="d54decb72f8cc8bf5474bf71260cb54bd17c971d" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="device/generic/common" revision="86f44a25414693396e51974bfb3af95ec1be0cca" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="device/generic/goldfish" revision="b4df1fcb1cbd11dcd3630f683d78d3d40274d28f" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="device/generic/goldfish-opengl" revision="37f7e4c6694c9c07e25a7cf49ae2d46faa488f44" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="device/generic/car" revision="db1f74ede81bff81a3d08ff7fd33173614428eac" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="device/generic/common" revision="b1cb67f6e44fae5e16a1b9b2f01c9f6b0fc89ca3" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="device/generic/goldfish" revision="227372177dc86b424da6c710cd1f9b768d340eb2" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="device/generic/goldfish-opengl" revision="4c34ca6f8f236ac22875423845c303536ecee2c1" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="device/generic/mini-emulator-arm64" revision="9ceba60b3bd63579855539b380f79d8997f5184e" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="device/generic/mini-emulator-armv7-a-neon" revision="badf9c65abad10a7d6ca27168001101da850d682" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="device/generic/mini-emulator-x86" revision="540a2a226bd650f6b15339f8432effdd99916b58" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="device/generic/mini-emulator-x86_64" revision="bff41129db5bdb6e72196e768db214c5097a5ee2" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="device/generic/opengl-transport" revision="34552eef2d644c7a566acfedbb2596379d1226e2" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="device/generic/qemu" revision="3e8225d3b0b4e6511c389b0e3b3bd066a2aaae1e" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="device/generic/trusty" revision="739031d0546da17b860b816a3acbcc560780b59c" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="device/generic/trusty" revision="dda6543abcd1861abb68194bf940756dc926cbab" upstream="master"/>
   <project dest-branch="master" groups="device,pdk" name="device/generic/uml" revision="a82bd5ee8eeaa403a1f18294f2e8f9e7f7bfa4b2" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="device/generic/x86" revision="3f0ca6ed17e03fb19b8a5d3d30cebe4dff50fa19" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="device/generic/x86_64" revision="adccc2135d2c69562be3f8cf45be6849c6cd22a8" upstream="master"/>
   <project dest-branch="master" groups="device,broadcom_pdk,generic_fs,pdk" name="device/google/atv" revision="5142bd21c19b9e7c441ff28e489b2060e8a1c04a" upstream="master"/>
-  <project dest-branch="master" groups="device,bonito" name="device/google/bonito" revision="777f276c1a4b2884cadecff87b889d63a628541a" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="device,bonito" name="device/google/bonito-kernel" revision="1202595c7937f0ca93ede668901ae7e86922114a" upstream="master"/>
-  <project dest-branch="master" groups="device,bonito" name="device/google/bonito-sepolicy" revision="6c6d6911d6e2b6345fe0ad31c7f3ffae7e2d91bf" upstream="master"/>
-  <project dest-branch="master" groups="device,pdk" name="device/google/contexthub" revision="4f57e44a6231795ba0a8ae78333bd8c17d1877e6" upstream="master"/>
-  <project dest-branch="master" groups="device,coral" name="device/google/coral" revision="8ac6e60bd90fe743a613e009b71e7bc456ea678c" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="device,coral" name="device/google/coral-kernel" revision="ac7c2f18ba9140cbdb955564d344f18e1c718baf" upstream="master"/>
-  <project dest-branch="master" groups="device,coral" name="device/google/coral-sepolicy" revision="b30e66b508509b0f2a1f34e31ef41c1c546f8ea7" upstream="master"/>
-  <project dest-branch="master" groups="device,crosshatch,generic_fs" name="device/google/crosshatch" revision="1713f9dd9558ac1cc3d45b8155ac15b1e945daa4" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="device,crosshatch,generic_fs" name="device/google/crosshatch-kernel" revision="1b4255539658ba315f02ec284861fa3a53623a90" upstream="master"/>
-  <project dest-branch="master" groups="device,crosshatch,generic_fs" name="device/google/crosshatch-sepolicy" revision="210273b63cdb89cbf518d185358cc47f9245ce5b" upstream="master"/>
-  <project dest-branch="master" groups="device,pdk" name="device/google/cuttlefish" revision="5b09544606854bac3e34b61ec78fab4ac7afdb4c" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="device,pdk" name="device/google/cuttlefish_kernel" revision="aac14c2c09be39e554cb9b71f4a2d3e764a633ad" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="device,pdk" name="device/google/cuttlefish_vmm" revision="b93775b0d9209656ddbccd7e3b3d0fa665bd7a8f" upstream="master"/>
+  <project dest-branch="master" groups="device,bonito" name="device/google/bonito" revision="bd8df1a5f6e4a1c25249cae2278cfe923bd85aba" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="device,bonito" name="device/google/bonito-kernel" revision="91e41dd6beda7888b8041c16de2ded2352acb2cd" upstream="master"/>
+  <project dest-branch="master" groups="device,bonito" name="device/google/bonito-sepolicy" revision="fa39f77f524f0a134a2f53b6559a971ba1b4691e" upstream="master"/>
+  <project dest-branch="master" groups="device,pdk" name="device/google/contexthub" revision="71b6e4d0f388b87f1b2fce740547b4c7253ff3a8" upstream="master"/>
+  <project dest-branch="master" groups="device,coral" name="device/google/coral" revision="8469f0acb0d05559fa83cb84aad9478020818851" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="device,coral" name="device/google/coral-kernel" revision="a01b6a0a163a0585a9b520eff97ad500635129b8" upstream="master"/>
+  <project dest-branch="master" groups="device,coral" name="device/google/coral-sepolicy" revision="bf44efd3b63b9feaea550bf03ee034c4a18faa4b" upstream="master"/>
+  <project dest-branch="master" groups="device,crosshatch,generic_fs" name="device/google/crosshatch" revision="05c7132beae42948b5313343e33a89f1d7bfbc8a" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="device,crosshatch,generic_fs" name="device/google/crosshatch-kernel" revision="4ca728d7c1b69959fe4a74964c6d85f7a8a2f666" upstream="master"/>
+  <project dest-branch="master" groups="device,crosshatch,generic_fs" name="device/google/crosshatch-sepolicy" revision="b91a03298df80c0e6d52d04ada2e7901ed0528f3" upstream="master"/>
+  <project dest-branch="master" groups="device,pdk" name="device/google/cuttlefish" revision="e80f4a545c60051df30bbc15e392b4f53ee892f3" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="device,pdk" name="device/google/cuttlefish_kernel" revision="d1f215c61e10dbe787095cbd23c524fe7a381306" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="device,pdk" name="device/google/cuttlefish_vmm" revision="693d126429c1b5307a4ab7b6bfc639c60b259f04" upstream="master"/>
   <project dest-branch="master" groups="device" name="device/google/fuchsia" revision="b9172e6cf28630eccb3ca9b534e44ad7700f3fe1" upstream="master"/>
   <project dest-branch="master" groups="device,generic_fs,muskie" name="device/google/muskie" revision="4223d690c041237cdac19a9d773a92a5f47fd4a6" upstream="master"/>
-  <project dest-branch="master" groups="device,taimen" name="device/google/taimen" revision="233d637b103bccdbbc732a7467e909095fa53b12" upstream="master"/>
+  <project dest-branch="master" groups="device,taimen" name="device/google/taimen" revision="18953b49172bc80ca0196d90a3d873b4ab24386a" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk" name="device/google/vrservices" revision="7cb17e865f59ce40ce0393dfccddbc0807698806" upstream="master"/>
-  <project dest-branch="master" groups="device,generic_fs,wahoo" name="device/google/wahoo" revision="728b47e0c1e0863840bc70eaef28cc46128dc359" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="device,generic_fs,wahoo" name="device/google/wahoo-kernel" revision="462f20ca5dad28b293e512805da84ae4182fdbbb" upstream="master"/>
+  <project dest-branch="master" groups="device,generic_fs,wahoo" name="device/google/wahoo" revision="07183ae1a322084b9933195f3f0173b895f2d658" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="device,generic_fs,wahoo" name="device/google/wahoo-kernel" revision="88e41c98d24bca0dad355a828f06adc34c3a91f0" upstream="master"/>
   <project dest-branch="master" groups="device,generic_fs" name="device/google_car" revision="dc1c9c4bff30fea04090b73a652de09a24424e87" upstream="master"/>
-  <project dest-branch="master" name="device/linaro/bootloader/OpenPlatformPkg" revision="c8d103d0295bcf67eca64d74b8c2ec611125240e" upstream="master"/>
-  <project dest-branch="master" name="device/linaro/bootloader/arm-trusted-firmware" revision="e48d9816cf23530327456da2a2ae87ec3eb0514b" upstream="master"/>
-  <project dest-branch="master" name="device/linaro/bootloader/edk2" revision="70739421c7bb36e06a2544a2111ea6d18961fa04" upstream="master"/>
-  <project dest-branch="master" groups="device,dragonboard,pdk" name="device/linaro/dragonboard" revision="fd7bfa1fa7e894acae9fdad0acd4591835d4c594" upstream="master"/>
+  <project dest-branch="master" groups="device,dragonboard,pdk" name="device/linaro/dragonboard" revision="ac5ab76ae185210f5eb94a50d9b7ae96fa81b95f" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="device,dragonboard,pdk" name="device/linaro/dragonboard-kernel" revision="6480d56127bc2240fc3bf0a58d51e32e230efe11" upstream="master"/>
-  <project dest-branch="master" groups="device,hikey,pdk" name="device/linaro/hikey" revision="dc8ba44cb3ee271694a970f10b41731b3606c819" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="device,hikey,pdk" name="device/linaro/hikey-kernel" revision="116a79898b28bf00390abfc7d73df24fc7905856" upstream="master"/>
+  <project dest-branch="master" groups="device,hikey,pdk" name="device/linaro/hikey" revision="2eb26a27ba926d6c28bc3c96285920fc59b2d632" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="device,hikey,pdk" name="device/linaro/hikey-kernel" revision="7d517262be51b97a7721662aaceed51e0ea2e901" upstream="master"/>
   <project dest-branch="master" groups="device,poplar,pdk" name="device/linaro/poplar" revision="181859a88ffbcd59b0441e77b485421d51c479fc" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="device,poplar,pdk" name="device/linaro/poplar-kernel" revision="d9338d916fee52afdb36115925f2ad570ec0cb19" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="device/sample" revision="8a95bcf3ab4d6b5c6e1f0951363efd72a7e3f808" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="device/sample" revision="74a2895b2ff24d61a3b277a9a5dbf78ab492b78b" upstream="master"/>
   <project dest-branch="master" groups="device,beagle_x15,pdk" name="device/ti/beagle-x15" path="device/ti/beagle_x15" revision="29a8d8c65aa9222b60d3576d2d41afa34b1ebaca" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="device,beagle_x15,pdk" name="device/ti/beagle-x15-kernel" path="device/ti/beagle_x15-kernel" revision="0d99bf0b39100deba5ea9071d6472acb3bc09103" upstream="master"/>
-  <project dest-branch="master" groups="vts,pdk" name="kernel/configs" revision="24d515f80acee372a167c8ab9f7c6472f85cae4f" upstream="master"/>
-  <project dest-branch="master" groups="vts,pdk" name="kernel/tests" revision="1d86587a89374dde14919c8662a8f08e02cff69c" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/art" path="art" revision="1912a5c7b9400009e361b0db52da77cc78f1cd77" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/bionic" path="bionic" revision="ad4b47c4290d6291e4280707688ce54c9bf9b72c" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/bootable/recovery" path="bootable/recovery" revision="a9fff2f0216fc1cb3e5b76cdaac3a42bd6e10add" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/build" path="build/make" revision="0c263fd2717518c459d58c2c91e4c3ea87a94fa4" upstream="master">
+  <project dest-branch="master" groups="vts,pdk" name="kernel/configs" revision="b7f64c852d89a93749f2cb598f7371bc59485227" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk" name="kernel/prebuilts/5.4/arm64" revision="36a8c8b47a948ed4da536a48b08a21502eadc3ab" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk" name="kernel/prebuilts/5.4/x86-64" path="kernel/prebuilts/5.4/x86_64" revision="0bee0ce0a7824443d482049742e1904c6fc1ef22" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk" name="kernel/prebuilts/mainline/arm64" revision="1ce6ec05df2fcf8e6a1d7fdf547095eb567bb0df" upstream="master"/>
+  <project dest-branch="master" groups="vts,pdk" name="kernel/tests" revision="b7769d6474435c70b2be16aeb0ae4e268c840968" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/art" path="art" revision="d9af38a3b76fc54909148456da2701666bade6e0" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/bionic" path="bionic" revision="5ca9a152454ced44a2c79816e0b05a7ed35670b8" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/bootable/recovery" path="bootable/recovery" revision="435a5fc0c288c0134edc597c2297a602602be108" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/build" path="build/make" revision="c4e9bf20ce420e36c075349bbb23ddffffd59363" upstream="master">
     <copyfile dest="Makefile" src="core/root.mk"/>
     <linkfile dest="build/CleanSpec.mk" src="CleanSpec.mk"/>
     <linkfile dest="build/buildspec.mk.default" src="buildspec.mk.default"/>
@@ -75,111 +75,113 @@
     <linkfile dest="build/target" src="target"/>
     <linkfile dest="build/tools" src="tools"/>
   </project>
-  <project dest-branch="master" groups="pdk,tradefed" name="platform/build/blueprint" path="build/blueprint" revision="10b473fefacd57c33d442767332780b3d6857ef5" upstream="master"/>
-  <project dest-branch="master" groups="pdk,tradefed" name="platform/build/soong" path="build/soong" revision="6116ffdcf5fac324afcb1c6293f472cd636da025" upstream="master">
+  <project dest-branch="master" groups="pdk,tradefed" name="platform/build/blueprint" path="build/blueprint" revision="c69182870e7d940c0d1495b5098701d362baea44" upstream="master"/>
+  <project dest-branch="master" groups="pdk,tradefed" name="platform/build/soong" path="build/soong" revision="91c3e4ec1a902fe6624174125dd08d8e500cc771" upstream="master">
     <linkfile dest="Android.bp" src="root.bp"/>
     <linkfile dest="bootstrap.bash" src="bootstrap.bash"/>
   </project>
   <project dest-branch="master" groups="pdk" name="platform/compatibility/cdd" path="compatibility/cdd" revision="30d5862b67bc41e5e9fc18253680a09018cbe865" upstream="master"/>
-  <project dest-branch="master" groups="cts,pdk-cw-fs,pdk-fs" name="platform/cts" path="cts" revision="643ca3861e51d63f4da39834c29c4de0dccb3354" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/dalvik" path="dalvik" revision="d236cfb4cf2b757c6ed728688a9034ef88338fc6" upstream="master"/>
-  <project dest-branch="master" groups="developers,pdk" name="platform/developers/build" path="developers/build" revision="6a8a6e64206de0aa11d0221815ac3706f97fff24" upstream="master"/>
+  <project dest-branch="master" groups="cts,pdk-cw-fs,pdk-fs" name="platform/cts" path="cts" revision="ff404f65ba2aaf91e68c15e83169d198beab768d" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/dalvik" path="dalvik" revision="f9ab924fb79754fba0f45fab7f452f8a9f950715" upstream="master"/>
+  <project dest-branch="master" groups="developers,pdk" name="platform/developers/build" path="developers/build" revision="90830880185d521e8f79f2ebb8b4a78c4426a748" upstream="master"/>
   <project dest-branch="master" groups="developers" name="platform/developers/demos" path="developers/demos" revision="03814c35b8ee0a1284c667556260124d97466b28" upstream="master"/>
-  <project dest-branch="master" groups="developers" name="platform/developers/samples/android" path="developers/samples/android" revision="9083bced6874c606043ebfb36bb1f71f67090ecc" upstream="master"/>
-  <project dest-branch="master" groups="developers,pdk-cw-fs,pdk-fs" name="platform/development" path="development" revision="86b1847e6c280e6e84c970620afdd0a8dd1d1046" upstream="master"/>
+  <project dest-branch="master" groups="developers" name="platform/developers/samples/android" path="developers/samples/android" revision="b590b3f07f382430954c0746c06c6366cc735b5b" upstream="master"/>
+  <project dest-branch="master" groups="developers,pdk-cw-fs,pdk-fs" name="platform/development" path="development" revision="38280c6b55aa62a43e19875bd534f6cde55b504f" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/FP16" path="external/FP16" revision="6321f9ece6de2c375a9a3e9fc5213addee2d187a" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/FXdiv" path="external/FXdiv" revision="dba5619fc6fd63d8ea355879ceabcece683aad81" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/ImageMagick" path="external/ImageMagick" revision="d65c43ff7e19a4a08d4c041d5f30deac688d23eb" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/OpenCSD" path="external/OpenCSD" revision="5d9474806318db0a9a7ba94089c490b5927e12dd" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/OpenCSD" path="external/OpenCSD" revision="b13c2dbf7947158c581c3bc742e45da0e7ecd56d" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/Reactive-Extensions/RxCpp" path="external/Reactive-Extensions/RxCpp" revision="e1911558a963dd6d531ea5690c3c7b669b737221" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/XNNPACK" path="external/XNNPACK" revision="f49bc2c981cfbceae961eb7c8d3b3b6de7201f8e" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/aac" path="external/aac" revision="e76ca4d9acee82700e1eecf84928f0faa4b56564" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/XNNPACK" path="external/XNNPACK" revision="ef75bc987fab3b70d32b812b7ff2eb2b894b4948" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/aac" path="external/aac" revision="760e8921c22c0185bc68f8a9884f0e8ddb7a25a4" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/abseil-cpp" path="external/abseil-cpp" revision="f194138dceced5005962a11ad5bda7f485f05282" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/adhd" path="external/adhd" revision="bdf0d80f2ca1cef13c96ca4fed8bca57b644c3d9" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/adhd" path="external/adhd" revision="9ed35185f882a9a4ed7f639df2423932feb2d2c0" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/android-clat" path="external/android-clat" revision="c786b7409032050721021583236de8608ac8948e" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/androidplot" path="external/androidplot" revision="934267aac685318a07d81f4be6ce9570f680db6a" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/angle" path="external/angle" revision="f525d8a2dccb1ea32143472d004af44198d8c775" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/angle" path="external/angle" revision="cc9c2a950a031368ed94331762770d03cd2231d3" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/ant-glob" path="external/ant-glob" revision="82cf4fe5a6b15ac35b731c00741c47b9ef596113" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/antlr" path="external/antlr" revision="581e666e25bb4c1e934a1bd9225e66319d2e01a2" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/apache-commons-bcel" path="external/apache-commons-bcel" revision="7bc65fcf0acbd82386c038e98c9870e3166e5d13" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/apache-commons-compress" path="external/apache-commons-compress" revision="fe57d998587dbcedc0389d1b3a99ecf90289ef5a" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/apache-commons-math" path="external/apache-commons-math" revision="30c8d5d492c594d3dd736368fbf9f7970371134d" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/apache-harmony" path="external/apache-harmony" revision="540806da4a7adf167b1a7050b66c54ef1aa86707" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/apache-http" path="external/apache-http" revision="d176cfc822b87662e164976f81aad9f15fc52833" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/apache-harmony" path="external/apache-harmony" revision="c515711c52451ac11742715affdffed3445c7bfb" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/apache-http" path="external/apache-http" revision="55b5ba17afdc82151d0a1887dd44714f89c7d963" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/apache-xml" path="external/apache-xml" revision="2086faacd79ed8b8283a96b276a2353165662d55" upstream="master"/>
   <project dest-branch="master" groups="vendor" name="platform/external/arm-neon-tests" path="external/arm-neon-tests" revision="f3d72fcbc0aabdd329edeb7041847a4239fd401f" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/arm-optimized-routines" path="external/arm-optimized-routines" revision="5bde7af22aec08b657b85f41e30395f3a108ab69" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/arm-trusted-firmware" path="external/arm-trusted-firmware" revision="a73922dd3563716cb58944e0585b33dbaf26ff08" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/external/autotest" path="external/autotest" revision="faa984241ca58a02ad24cc1b3715e54419da7f10" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/avb" path="external/avb" revision="e439e5e921f00008bf72c48d539859a269b3965d" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/bc" path="external/bc" revision="2814d460e987943486b0ae8aea15215f30bd3be3" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/auto" path="external/auto" revision="8d0c8f812ffa1c0ba1573e4e8c225f9ea874831d" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/external/autotest" path="external/autotest" revision="a330536eb2be3c6ef6204555d1cb33a3b6de2b7f" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/avb" path="external/avb" revision="28d0d9d821c75cd54c795cad2c6739a5d3db4d53" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/bc" path="external/bc" revision="77f89687b4c551d58003431962af111160c37028" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/bcc" path="external/bcc" revision="fd247435dfdfe9a6daa159620127f2724f6d1d7a" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/blktrace" path="external/blktrace" revision="d1d8f301c0f97048dbc3431c1a58a6d7313aa153" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/boringssl" path="external/boringssl" revision="2e925e97fef694474f6984c3edef8a9f348affa9" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/bouncycastle" path="external/bouncycastle" revision="075d121232c1bb3f940a8aedd26a42923c9058a8" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/boringssl" path="external/boringssl" revision="ba9db8781ec11859132f543aebff5d6093214751" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/bouncycastle" path="external/bouncycastle" revision="c62b2d68553fbd3c7cd9b9053f812bf36bd9e63d" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/brotli" path="external/brotli" revision="4bf7087b5c7e33361469ed86c1de90df8450ce88" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/bsdiff" path="external/bsdiff" revision="c62b211329f251ca43d2dcb419384bc747f72944" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/bzip2" path="external/bzip2" revision="a75d53c4bac5db59bad722678f1c231ef2d92543" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/caliper" path="external/caliper" revision="e66828ca36bd5eb29473f9a761d684528b2d4346" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/caliper" path="external/caliper" revision="f0a3eafc7ecccfa7adbb08dcf455545ace087a43" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/capstone" path="external/capstone" revision="f1f1cbc054db7021d4167a96b55783e087e1b7b4" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/catch2" path="external/catch2" revision="976d18eee9e452380d6a8725d894cd083ba6a482" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/cblas" path="external/cblas" revision="48c69ccaa4f0d3894335125d37e919ea655769c2" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/cbor-java" path="external/cbor-java" revision="3d7fde33f9364c80cabd241c6560b33ae4c83c7e" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/chromium-libpac" path="external/chromium-libpac" revision="ceee94e58c18e6a650051477dda8ae887bb4b630" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/chromium-trace" path="external/chromium-trace" revision="fe6a5051c854157fb8579d4139adcaa31f319b40" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/chromium-libpac" path="external/chromium-libpac" revision="9fba6d0933c72d61b8025bc730a6ee1ac9902c3c" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/chromium-trace" path="external/chromium-trace" revision="9755dd361ce1b946c6572f93e88832e19d4943d9" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/external/chromium-webview" path="external/chromium-webview" revision="d3f0768ab7566dacfc7cadfc4f661ab30d8ecba0" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/clang" path="external/clang" revision="cf64c66ce781cbcc0d9aeb9651bcf489846d4fd9" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/clang" path="external/clang" revision="382efa3f0dd36a342e30e8bf06af717e0664de3f" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/cldr" path="external/cldr" revision="09ea71c1137e922826e9c5d60d3307b8b2b73fef" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/cn-cbor" path="external/cn-cbor" revision="8f258525f7792d5beefa7fdb2ea064f51651f565" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/compiler-rt" path="external/compiler-rt" revision="83c5095a0c8a7a90930e2ba427fdb64115402e21" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/conscrypt" path="external/conscrypt" revision="4efd91f7243bda901b298d8987ec4e3476f58ad7" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/compiler-rt" path="external/compiler-rt" revision="e6b2b9154eb8d379dded20d1f9a746b4e993aff6" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/conscrypt" path="external/conscrypt" revision="a5be0101ff50cd616a70e0c586ec05be91bf16fb" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/cpu_features" path="external/cpu_features" revision="22499193e0470a947ed5189cefb9b0537f461fbe" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/cpuinfo" path="external/cpuinfo" revision="6552164601ef6676fa80f2495c60a517509ef526" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/cpuinfo" path="external/cpuinfo" revision="aff0604684a8512c65b551c8dc0025919036fc44" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/crcalc" path="external/crcalc" revision="86481d30939166237ecd8d2ebb73ac85da3488ec" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/cros/system_api" path="external/cros/system_api" revision="1f322ad4c14baac5d33033be7f57cb7ef65c8f38" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/crosvm" path="external/crosvm" revision="fe61ac161a697a028bd75c95ebecb34974d8c776" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/curl" path="external/curl" revision="ea155d05e764c6543c0d6be01edf12dda123ed99" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/dagger2" path="external/dagger2" revision="3809f3dd127716a59f14536b19fe5cab0e0a445e" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/crosvm" path="external/crosvm" revision="de72366de2fc1abc06ae6230a48c882f966aff43" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/curl" path="external/curl" revision="23abcba8890bbe842707ffe8d777aeb50adfd89d" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/dagger2" path="external/dagger2" revision="3ea05b789ebea6b0b1c726cd19600ebf822aa1f2" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/external/deqp" path="external/deqp" revision="ee2101f344ad88ceee4e15ce4afcf2eab2df3c9d" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/external/deqp-deps/SPIRV-Headers" path="external/deqp-deps/SPIRV-Headers" revision="fd44500f60ca16d4e9ffede30efb945cab3a7240" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/external/deqp-deps/SPIRV-Tools" path="external/deqp-deps/SPIRV-Tools" revision="49378ae8cb471ba551c4db0a8eaf0f09884c9217" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/external/deqp-deps/glslang" path="external/deqp-deps/glslang" revision="4aefaf749acac904835dfb6ca2db580e706d05c8" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/desugar" path="external/desugar" revision="b694e88fa82b92ef1a22e85145f267d846f3629a" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/desugar" path="external/desugar" revision="12b1f91034819c58bd6f96eac01fee2b80d1ebfa" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/dexmaker" path="external/dexmaker" revision="461fe849522042af0d82cdf5b1dbedc249091f1a" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/dlmalloc" path="external/dlmalloc" revision="86a59f3d28c853ef8b45ee64825d4fd6a9a1b298" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/dng_sdk" path="external/dng_sdk" revision="3ad1308e09dac73f5a95633e27ac519875c2e288" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/dng_sdk" path="external/dng_sdk" revision="84de511df4f08157042517717a1162ecb2cf31ca" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/dnsmasq" path="external/dnsmasq" revision="b4504cce43b8013c67ca2052ef5120f4dd89ed8b" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/doclava" path="external/doclava" revision="b094e0c61fa69a2e500a31754201deb54cd25441" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/dokka" path="external/dokka" revision="1809b94324138930ae3e730cc88870ddae1bd8df" upstream="master"/>
-  <project dest-branch="master" groups="drm_hwcomposer,pdk-fs" name="platform/external/drm_hwcomposer" path="external/drm_hwcomposer" revision="696cb269cb619021cba681111f7334f1c0dd490a" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/doclava" path="external/doclava" revision="696f76f1d7a523ae9663ebecd7035e459fe89d19" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/dokka" path="external/dokka" revision="9b8280a227848c53045cabc5a86cd013d720c63c" upstream="master"/>
+  <project dest-branch="master" groups="drm_hwcomposer,pdk-fs" name="platform/external/drm_hwcomposer" path="external/drm_hwcomposer" revision="37b57553a14517b4be01ea98ff9a165e2d05214f" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/drrickorang" path="external/drrickorang" revision="f1a513d32bbdeaa358991f95a157de9c0a14afe8" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/dtc" path="external/dtc" revision="4b9b2da7a79260746ac8698e441c69d004379e83" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/dtc" path="external/dtc" revision="83534bb2d821edc66db3e8324641aab26a7caaf5" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/dynamic_depth" path="external/dynamic_depth" revision="fca207ba92c3fead9cd93d08fc3ad9ed445d1f04" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="4d45d7ba7451d64e564dfbacdbafe4e592cd67af" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/e2fsprogs" path="external/e2fsprogs" revision="876a584da3168d2e5bd1d287740e7e433b49e4fe" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/easymock" path="external/easymock" revision="6a93dfcd7e2ab4a661d40641a70982da6967b2a1" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/eigen" path="external/eigen" revision="6d1df66700d01a07243d97c46705244ac7e0d04d" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/elfutils" path="external/elfutils" revision="bbf5a9c374191c52fddad38bd2558cb0adc828f9" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/elfutils" path="external/elfutils" revision="197f13f7a0bdd4c7274032197329eac70d99bb61" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/emma" path="external/emma" revision="6e14649fb4b4eed576870ce5feddf881d6cd109d" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/error_prone" path="external/error_prone" revision="9bfe7c610d1cb9f5da773ed16ff3e05a69105077" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/escapevelocity" path="external/escapevelocity" revision="959711e574e3c12b4d7e4b71858372de9489eeae" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/ethtool" path="external/ethtool" revision="25ebc5901417ef3020ed39d2f81f7a202551d962" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/expat" path="external/expat" revision="3f5ade9e323e15b6526c1b812797875b76201f51" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/f2fs-tools" path="external/f2fs-tools" revision="471bb35b424490b5262d44c542b9ea5f23cc67a7" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/f2fs-tools" path="external/f2fs-tools" revision="36097e5108d5474e6ad66652554b93696a4293ea" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/fastrpc" path="external/fastrpc" revision="8a30933a85303af3c4f7747d58b3ae85e0f55df4" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/fdlibm" path="external/fdlibm" revision="ecde95f0e8908e1c0c552954d8f27a44612df27c" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/fec" path="external/fec" revision="f76ec3955db8c868f41f4c2a8590fdb9d77e9223" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/flac" path="external/flac" revision="0be0e05ec588e5a5a15cb955ba7750b4689e9b53" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/flatbuffers" path="external/flatbuffers" revision="0d42ca2da0453b6ab983ca8f7e94039269dfb92f" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/fmtlib" path="external/fmtlib" revision="bb56bd984c93597a8b2a90931351aef89d7edd18" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/fonttools" path="external/fonttools" revision="d5e44ff2cfe7a21284ceb2b9e6a6717b7d5e7c47" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/freetype" path="external/freetype" revision="3caf8bc06d5e7b30487e801cbc3cb6be637ba456" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/flac" path="external/flac" revision="40076263a6b46b95b3d0ac1f607208f27228c6d2" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/flatbuffers" path="external/flatbuffers" revision="e87b31da8ecbc05a9a12d817cba3a2c79f653758" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/fmtlib" path="external/fmtlib" revision="3f9c7e3871cce490b1305ee7c0002269c9c6c0c5" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/fonttools" path="external/fonttools" revision="a7ee29ebd4c9d39d29ee03f7746bb6af1c3f7e6b" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/freetype" path="external/freetype" revision="deb9aaa78155f93efcecb6f47b85ec77190c6f16" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/fsck_msdos" path="external/fsck_msdos" revision="2f294595d964f2b1ae21dfd02ba58e9ee1e839ca" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/fsverity-utils" path="external/fsverity-utils" revision="7b8d3d5ce84e02a3c441ff335c3873a8fa7f1139" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/gemmlowp" path="external/gemmlowp" revision="ebffc28dbbc05bc50df225613cb464af2db12c18" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/gemmlowp" path="external/gemmlowp" revision="ca41a583fa4faa3c8fa560c7ce52b2a130519979" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/gflags" path="external/gflags" revision="6827298aeef132e2545279ed2ac5d0b74fa18e7a" upstream="master"/>
   <project dest-branch="master" groups="pdk,qcom_msm8x26" name="platform/external/giflib" path="external/giflib" revision="efb0f5c4b88455acfcf19f4a42c9bdaa5deb5233" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/glide" path="external/glide" revision="305446b544892451a5fbcfffd481236d175b2a73" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/golang-protobuf" path="external/golang-protobuf" revision="b34db27e38b1b60c83ab7c3a1985203c3f98281b" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/google-benchmark" path="external/google-benchmark" revision="a089bf3939184223f72ec5c8e02b18b5e0251ea9" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/google-benchmark" path="external/google-benchmark" revision="1c12faf75d74e933af10361bb5d264f28dad4747" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/external/google-breakpad" path="external/google-breakpad" revision="ba746a803abbb11df24e35735dfef38f73f3a4b5" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/google-fonts/arbutus-slab" path="external/google-fonts/arbutus-slab" revision="a4585df413033fd56cc9d1be870441f51be3bf60" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/google-fonts/arvo" path="external/google-fonts/arvo" revision="69e476290ceb1a490635253a6c406ca04077e731" upstream="master"/>
@@ -191,24 +193,25 @@
   <project dest-branch="master" groups="pdk" name="platform/external/google-fonts/rubik" path="external/google-fonts/rubik" revision="82064b902d3b3d5aab81a9b2c248e7fc046b9cf6" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/google-fonts/source-sans-pro" path="external/google-fonts/source-sans-pro" revision="b22b4bea8200f20bbf6df4a5f4798b76bd8e8846" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/google-fonts/zilla-slab" path="external/google-fonts/zilla-slab" revision="646ccf753dd1a4101b4f13d002c03a407bec55bf" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/google-fruit" path="external/google-fruit" revision="07bde496dc32b88b2d37cb3ec8bc362bb3795331" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/google-fruit" path="external/google-fruit" revision="59888e7910bfe28018b88b3c6fef2942ac43d381" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/google-java-format" path="external/google-java-format" revision="7aef6bcfd33e998e4cee84f80e0af3c16e864a94" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/google-styleguide" path="external/google-styleguide" revision="c8c1424155e07f3773b731510b08f1dcd5855c76" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/googletest" path="external/googletest" revision="de13bdb524c9d888b24a56490742227d9aabad12" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/googletest" path="external/googletest" revision="f544b417450b696ea06f7f69686a0d7bfe80d968" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/gptfdisk" path="external/gptfdisk" revision="f00572f20bf48fb47d90a3d71c1dbd5a7c97f8b0" upstream="master"/>
   <project dest-branch="master" groups="pdk,tradefed" name="platform/external/grpc-grpc" path="external/grpc-grpc" revision="e5624b1eaec69e9c6c27f4c14ed0eb6a126c013c" upstream="master"/>
-  <project dest-branch="master" groups="pdk,tradefed" name="platform/external/grpc-grpc-java" path="external/grpc-grpc-java" revision="58f48cc424a4db0eb99fd891986573023ae23d9f" upstream="master"/>
+  <project dest-branch="master" groups="pdk,tradefed" name="platform/external/grpc-grpc-java" path="external/grpc-grpc-java" revision="9297fc3b140d1ab6a9622e51299de75aeee18138" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/guava" path="external/guava" revision="76e1cfd9dd039013e7edc101dbd40e70e83c0a85" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/guice" path="external/guice" revision="362cdb1e951d12da4a7b2489ab8eedb327f92538" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/gwp_asan" path="external/gwp_asan" revision="d2ac860fa64716566fa046827b9364e9422abdeb" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/guice" path="external/guice" revision="a3c7060e68d73ba4962673ff81b9a4937aef6742" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/gwp_asan" path="external/gwp_asan" revision="b57bc3b81abb615a58f8cf1bf7fe232c8a7c462b" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/hamcrest" path="external/hamcrest" revision="c3f6da7e6510ccb68c55332ba9deee09e714c506" upstream="master"/>
   <project dest-branch="master" groups="pdk,qcom_msm8x26" name="platform/external/harfbuzz_ng" path="external/harfbuzz_ng" revision="ce643e153b5f9179744d1027fad2e274a041a9b5" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/honggfuzz" path="external/honggfuzz" revision="4da5ca807ec753ef0dba496f8db65738084c42bb" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/hyphenation-patterns" path="external/hyphenation-patterns" revision="061d892d99db8594ab858ada1b34ef9935b1c7af" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/icu" path="external/icu" revision="74ec87c44c33df37620f1f10c4c146f0b6a32ac6" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/icu" path="external/icu" revision="53ddc8d418456df980f1cb77d17e206e60a4a6cc" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/igt-gpu-tools" path="external/igt-gpu-tools" revision="c231060e4dbd680c770a0682e6b37ee875c0faf5" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/image_io" path="external/image_io" revision="878cbe0d3f24cac6f00905c541b65d0dc0427b34" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/ims" path="external/ims" revision="46fb045a7072499a16d00aff1e06f375edbe315a" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/iperf3" path="external/iperf3" revision="cc1d057ab6d9805d4abf505f02c63b8652ed937d" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/ims" path="external/ims" revision="918a6a4f587aeec2fd71e63bdd106f6d71d1f4c5" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/iperf3" path="external/iperf3" revision="25e8e69eee58ae9cf5e35e4235ac9159d580fa8b" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/iproute2" path="external/iproute2" revision="d6e38af5a74427c46e91147f6e39f0ebb11af199" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/ipsec-tools" path="external/ipsec-tools" revision="956806ac158bf4ac800967adafab9d46273ff0dc" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/iptables" path="external/iptables" revision="5858660f64fa3850aaf4e251b18f032bb7168f99" upstream="master"/>
@@ -217,94 +220,97 @@
   <project dest-branch="master" groups="pdk" name="platform/external/jacoco" path="external/jacoco" revision="bdbfb7047d87e8e790260a0fffb1afdf37ed3dc8" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/jarjar" path="external/jarjar" revision="f5f35e26f783c4a986a2c145d0743a4aa4171a9b" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/javaparser" path="external/javaparser" revision="ae622838617fa95231962c609dfa85b6a7c37d95" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/javapoet" path="external/javapoet" revision="6c962bdd20a2b3e47d2187f0d8fc116a6acfe416" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/javapoet" path="external/javapoet" revision="fc695240b7ec6ac465e155b3202dc691527b29c3" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/javasqlite" path="external/javasqlite" revision="1bfc2ec47cc265c1ebbfcdeb9fd92e3c29199896" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/jcommander" path="external/jcommander" revision="ee1e7b936f71a499707693d8820a27347b1267f3" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/jdiff" path="external/jdiff" revision="1508d2b9c7a9cf06ad6460155e82e18b6f4d9cf7" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/jemalloc" path="external/jemalloc" revision="ecdbccc7cb3d9d8e986019db37a21552324e7c1f" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/jemalloc_new" path="external/jemalloc_new" revision="b32ec89beb19643bc0f68b6e9495b9369e3da15f" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/jimfs" path="external/jimfs" revision="6bf99a7f011c391b4ebd5ee84e849f06a3fd1bcf" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/jimfs" path="external/jimfs" revision="b1bfb99b28a67b98287a475c5dce9344f0cc18ab" upstream="master"/>
   <project dest-branch="master" groups="pdk,tradefed,pdk-fs" name="platform/external/jline" path="external/jline" revision="619aadcb7088db71bfc701f881ac41413463e89f" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/jsilver" path="external/jsilver" revision="8d887a8f13fab888dd7c18254742856fbebfc3cd" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/jsmn" path="external/jsmn" revision="d876b9096dbc2b3b18ecca027af9c74890b54b72" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/jsoncpp" path="external/jsoncpp" revision="60f1d4392708db183229cdc306d299404794f4a5" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/jsr305" path="external/jsr305" revision="9fe096ad55e1718466e37a0601c010078f33a98b" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/jsr305" path="external/jsr305" revision="dd2dc84070de2b7e144f8bda30f262af7dd9b3a6" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/jsr330" path="external/jsr330" revision="5209aa2c7c1da68683ca9ff4d18c221126230262" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/junit" path="external/junit" revision="6fac8fec6c62ff66cb950b312ae09f7f6ef865e0" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/junit-params" path="external/junit-params" revision="96cef880fa30fdf0c6c1275a6e0d3228c9efde66" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/kernel-headers" path="external/kernel-headers" revision="e58316e074fd9f2ea8ad5eff9d29517cf61b31a8" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/kernel-headers" path="external/kernel-headers" revision="c9541004ddc0d5be38416f622afb7b8bab9f2043" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/kmod" path="external/kmod" revision="e62d44322d84833a2cf5b4ee649d65481504b7ae" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/kotlinc" path="external/kotlinc" revision="f301753662be558ac183ea762a89e7450d48e104" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/kotlinx.coroutines" path="external/kotlinx.coroutines" revision="4552b430c99a79d1a2685bcc54e3aa5207959b33" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/kotlinx.atomicfu" path="external/kotlinx.atomicfu" revision="fe5a26f975cc0867bf67f58faac0d5100aecde73" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/kotlinx.coroutines" path="external/kotlinx.coroutines" revision="d24bc80ff29c00647d0ea072913d380dad7e2787" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/kotlinx.metadata" path="external/kotlinx.metadata" revision="44866ae7e2062808c87fa331f17792ade5ea809b" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/ksoap2" path="external/ksoap2" revision="c5e0fcb70cdf6faaf073f7d676aab8184501ac7d" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libaom" path="external/libaom" revision="bfefc374b39b023a3722f7d378cdb06016f8d478" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libavc" path="external/libavc" revision="fa8ec83555b0946d01c60f6df9751c1aa490bf85" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libaom" path="external/libaom" revision="49f6f6562feac9be722a11111e0bf44d97310318" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libavc" path="external/libavc" revision="159799b4d41db730704416ac99614906823f7ff8" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libbackup" path="external/libbackup" revision="3559a596e471ac1082431fc7dc7f23a0598cfd82" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libbrillo" path="external/libbrillo" revision="e90530e683f19f3133184843830c222e4dd2e121" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libcap" path="external/libcap" revision="5a87f0eda987b08f70b40ca7d52ac0235388d1af" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libbrillo" path="external/libbrillo" revision="a4cec6c21e18b9c18540808d983064d81df00533" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libcap" path="external/libcap" revision="e0346e9fe5b37a81d111aac0a95ac2a5e4a5c81f" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libcap-ng" path="external/libcap-ng" revision="fe30cea9f3a21cdb96bff75a49837b6b7bba4420" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libchrome" path="external/libchrome" revision="123b79611d8169bd7846e2048ef23c6e99d1248f" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libchrome" path="external/libchrome" revision="edddb73384356911190b33bbce56ffacedc85da2" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libcppbor" path="external/libcppbor" revision="00e2c7c93606ad8dfb1913d8ced74e3a0f049e38" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/external/libcups" path="external/libcups" revision="46f00591066f458594bd77b31f2abd3ba218568b" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libcxx" path="external/libcxx" revision="1447d718cab6c1a5b6a2b66ab77a39148b2caf13" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libcxxabi" path="external/libcxxabi" revision="72a9c9f1f20747fa2899b964d30c8d117de54a04" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libdivsufsort" path="external/libdivsufsort" revision="9da4324328e728be1e99bf318623e4fd9861de41" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libdrm" path="external/libdrm" revision="06b698c2b81637b803c3467f57ab511d44fe8090" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libepoxy" path="external/libepoxy" revision="4b204d7bfef89bb435ce9566ed1ac828d15f4fbd" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libepoxy" path="external/libepoxy" revision="a428139a8138eae1a1556a063e8edeeddbba46d5" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libese" path="external/libese" revision="aaaf87dd1f9d3f08768a67e62957f33968a82f7d" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libevent" path="external/libevent" revision="66d97fce6163bdd40a7bd2324225021838f3f18c" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libexif" path="external/libexif" revision="49232eccdc24b72e3a3716c515ad7cd70dfe8e45" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libffi" path="external/libffi" revision="004e55c74517edc7db707429390d2d07a5df4bb4" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libevent" path="external/libevent" revision="f0077b80a031634c5c62cffa0a238923db77d45a" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libexif" path="external/libexif" revision="aace863d3801bf5207f1374eaa7d134718a931fe" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libffi" path="external/libffi" revision="27201c88d0657c2fa338e520eb0e0b5b83139f26" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libfuse" path="external/libfuse" revision="4db6b5519adceb891de3e05324565faa24e56e2d" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libgav1" path="external/libgav1" revision="901e60222112bc27912c704a8cc83837b0c9fc52" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libgsm" path="external/libgsm" revision="3faa49540d779c8d36d7b4d7e5ac0a7769835b0c" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libhevc" path="external/libhevc" revision="0af0c6a82a6425c4778277d9209f36fabc416b25" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libhevc" path="external/libhevc" revision="10fa7ae5b29040f2618566693946234c76d43b37" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libjpeg-turbo" path="external/libjpeg-turbo" revision="fdfd06bfabc924fe875d98d9f858d6b10f42daa8" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libkmsxx" path="external/libkmsxx" revision="db553c26484cc38daa54a5d8f43c564a82c5a8cc" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libldac" path="external/libldac" revision="ed310a0d66278e4d23c1ba4b2d087b9068d2c851" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libmpeg2" path="external/libmpeg2" revision="41abcf9aebd2c0317fd37fc8d9ab15b7a394ca94" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libmpeg2" path="external/libmpeg2" revision="6c83c697034a480ca5bdef65dfcebe05fce3a7e3" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libnetfilter_conntrack" path="external/libnetfilter_conntrack" revision="3d75fb70ef9cc05f2a18215b44a9a4e2151a8ad3" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libnfnetlink" path="external/libnfnetlink" revision="0a11f848c03f2dabd6b54588060ad6bffea2619b" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libnl" path="external/libnl" revision="4aa55aaed61e20a05d7f84c8eb9fa9dfc7bf7598" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libogg" path="external/libogg" revision="88ab2345a65b8eaec9157a6b3812a50fd60be610" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libopus" path="external/libopus" revision="5dfde48061c4177ac150c492d085a1825b30e1ba" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libopus" path="external/libopus" revision="164635a4a18c692a5b175e23768f3f83a92d39a6" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libpcap" path="external/libpcap" revision="061669a9e338f41bd2a50ea1dbdbe272f4c21ef2" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libphonenumber" path="external/libphonenumber" revision="127fc89c7fc3bb01b93fd69387a10cc476ccba86" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libpng" path="external/libpng" revision="d6c453834e5295de0714f8c7ebb7d4feb002c500" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libprotobuf-mutator" path="external/libprotobuf-mutator" revision="f0bf6bdf2e02492ae9920c6131706a0cc60f87db" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libsrtp2" path="external/libsrtp2" revision="84adc12cf9ffa9391da66b09c1fcf476aff83450" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libtextclassifier" path="external/libtextclassifier" revision="a25f7792dc3c220528817650f4dc3db053a28546" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libunwind" path="external/libunwind" revision="6860a68a2000d8a47d7f8157f7521461aa96f95d" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libprotobuf-mutator" path="external/libprotobuf-mutator" revision="09f79b6f994d09ace91daf88d8ba07a9c7bcfc92" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libsrtp2" path="external/libsrtp2" revision="d8f04c502bc1eba2f85305e3c2f62b53f5874a82" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libtextclassifier" path="external/libtextclassifier" revision="c71e760765d8a425d4cbc888a7ab61ff386b9967" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libunwind" path="external/libunwind" revision="2674521dff29c84e9b37b28243fdaf9ca24620cd" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="b2aff48eedb8ca162aa438135add08d915540925" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libusb" path="external/libusb" revision="117ebfb3c94058b37308e1aa4f60a5c705348fcf" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libutf" path="external/libutf" revision="bda0a6cb778f4ca1f8c6c0e69c9eae0e2c0fa15d" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libvpx" path="external/libvpx" revision="d53de4257603f3292c5928d74d59aa0e3259efd7" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libvpx" path="external/libvpx" revision="0d0c74a487ac47cae5f82ccb30d7dd48e7b23120" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libvterm" path="external/libvterm" revision="10b4d7643bcb3335f79eff5052eca63981e32d88" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libwebsockets" path="external/libwebsockets" revision="0b7c9f713c72c68d2d55154258d400cad92d3c99" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/libxaac" path="external/libxaac" revision="a4cd8c6bf67849e36384c55fbf30185c0c23fbd0" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/libxaac" path="external/libxaac" revision="6122d8fdb25726eaa03882aec03ce2fc65a52936" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/libxkbcommon" path="external/libxkbcommon" revision="bbdf3993463b2d792d3d56085c7e6e7d957ddaf6" upstream="master"/>
-  <project dest-branch="master" groups="pdk,libxml2" name="platform/external/libxml2" path="external/libxml2" revision="72ac6cf5b8ed69b2c05dcf5ba970b3fcdd4c1c4a" upstream="master"/>
+  <project dest-branch="master" groups="pdk,libxml2" name="platform/external/libxml2" path="external/libxml2" revision="6eada901dbc9b289ca34bf558885ad5d3fe9c4e3" upstream="master"/>
   <project dest-branch="master" groups="pdk,libyuv" name="platform/external/libyuv" path="external/libyuv" revision="2ee3028b36ac61abed29cbb379a411a98fe31677" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="vts,pdk" name="platform/external/linux-kselftest" path="external/linux-kselftest" revision="3e6bd6b610f818a9f491fae0fded5ac53cf073b5" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/llvm" path="external/llvm" revision="705510392b93ee4d83923344176b7d792bd68db1" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/llvm" path="external/llvm" revision="472bc9a55da4405a32a82cf38657d8ae3ac7ea05" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/lmfit" path="external/lmfit" revision="215e9f8136e415f986fbb1c4818c31dad08b8486" upstream="master"/>
   <project dest-branch="master" groups="vts,pdk" name="platform/external/ltp" path="external/ltp" revision="e328e82112e84baad7c5aa8a7176d15e0956f790" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/lua" path="external/lua" revision="81fe03fc67903444ae1bd49595758c5d8772f0ed" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/lua" path="external/lua" revision="3d75592d65d5a00179ae010979a824e3fb5ffba9" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/lz4" path="external/lz4" revision="91afe2b67975a02d1b5f7bd9ffff57d66ac60b1e" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/lzma" path="external/lzma" revision="b320dbbac4bc8a0d3f757c90a3c19e82da8bef30" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/marisa-trie" path="external/marisa-trie" revision="01a997e6dfb1e998935efe798ae974813533ba5d" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/markdown" path="external/markdown" revision="24b5e54d6f880b9562a0542ed003798686f5b2c3" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/mdnsresponder" path="external/mdnsresponder" revision="a809837a94aa8a412abd45babb6b415817a980b6" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/external/mesa3d" path="external/mesa3d" revision="f20360908a5653be4826678cd2b8b471ca98588d" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/mime-support" path="external/mime-support" revision="194d5579b66a8cb867e90fb1cc01c91575bdb11a" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/minigbm" path="external/minigbm" revision="702c5561af7c927fd2801a04111f43e411f1eed2" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/minijail" path="external/minijail" revision="83276a060dfc0788c8a5bb25c6c9a8eab81fd932" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/minigbm" path="external/minigbm" revision="9413c105e4c6ad73ea75819be57d7e5377a5013b" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/minijail" path="external/minijail" revision="81df0664f803a089b9e4055fe75d761fe02ff999" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/mksh" path="external/mksh" revision="efb93a535d09dced0c9d563fd0a1760550954184" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/mockftpserver" path="external/mockftpserver" revision="03695f685f192180268ee675f9e57a06f26d2b11" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/mockito" path="external/mockito" revision="370ee71047efd4b30af757307fadff5c611cbd43" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/mockwebserver" path="external/mockwebserver" revision="78f39a0b3dbccad698027acdc61b1d4b472bee3b" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/modp_b64" path="external/modp_b64" revision="2569ec99b0883c885b896a967c1ca514df6b975e" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/mp4parser" path="external/mp4parser" revision="47c6ee108cd8c883db6694495db42eed7c5de4ae" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/ms-tpm-20-ref" path="external/ms-tpm-20-ref" revision="08e3b32e71987a6fe4fec4e1697eae7de9476435" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/ms-tpm-20-ref" path="external/ms-tpm-20-ref" revision="4f0019d0be6056d15e7e8bcdc33b8d2b4b861cb5" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/mtpd" path="external/mtpd" revision="e32bc00d9b6a8ef3bff5ab1dcb73dbacd1a40f3e" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/nanohttpd" path="external/nanohttpd" revision="ff84149c71b11732ea2af0dd475c14f03265f4a4" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/nanopb-c" path="external/nanopb-c" revision="74741d77d4a4a7dd9147f4a7ce968752ab2b7f42" upstream="master"/>
@@ -318,29 +324,31 @@
   <project dest-branch="master" groups="pdk" name="platform/external/noto-fonts" path="external/noto-fonts" revision="b635f6273c1e393fde83609aa4b46cbcae92825e" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/oauth" path="external/oauth" revision="d1acf194b6d9a230bc9ab30462ad850fa7ec7b2d" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/objenesis" path="external/objenesis" revision="e5b2a52dfdae6fc3ddca23b43c66620a335fb036" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/oj-libjdwp" path="external/oj-libjdwp" revision="89f7385f3b685b41d3db5a46c74abf74705bf8a9" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/okhttp" path="external/okhttp" revision="8c15cd2eaafa77970328c7d188ef9cede275be53" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/one-true-awk" path="external/one-true-awk" revision="ad40bbb552beb0a1c6f99da95ef58c39792fabac" upstream="master"/>
-  <project dest-branch="master" groups="pdk,tradefed" name="platform/external/opencensus-java" path="external/opencensus-java" revision="1b51202d675c8e50efa12493e827bc47b686b273" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/oboe" path="external/oboe" revision="8f83b55281559392202e2fc04873b6de144fb0fc" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/oj-libjdwp" path="external/oj-libjdwp" revision="091ceb2bb2d4af87e3eb4ccdcfff3ad41db025ca" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/okhttp" path="external/okhttp" revision="c7003d30ef11d6d9845e1b77245365c41392d627" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/one-true-awk" path="external/one-true-awk" revision="7a9e0dfce59f1f8abcdca9cc73f779ccbb9f8d63" upstream="master"/>
+  <project dest-branch="master" groups="pdk,tradefed" name="platform/external/opencensus-java" path="external/opencensus-java" revision="65f84045ca1d01b0e1851d65e9fd3eb82b9d38f7" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/oss-fuzz" path="external/oss-fuzz" revision="8c011a1095fed0dbafbb53b4ad33f3b15b15d439" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/owasp/sanitizer" path="external/owasp/sanitizer" revision="d05deef05265ed83bf1e34d717d62161a846a87b" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/parameter-framework" path="external/parameter-framework" revision="b89422dfbb19bf8d6a4e6d25c404a6cc7f27dce6" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/pcre" path="external/pcre" revision="594ea567316acea9c34e521e1cbf0d420bf10e8c" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/pdfium" path="external/pdfium" revision="ca58c0ff1a35820edb48190412621e0af34afaa9" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/perfetto" path="external/perfetto" revision="130a852f852bdba14ec8b983d0301bcaf96d2351" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/perfetto" path="external/perfetto" revision="a4cba6578f09d606d32fe32bb0a0c6283ea6d198" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/pffft" path="external/pffft" revision="651d7f074901b683784bf148646229d4b218fa27" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/piex" path="external/piex" revision="d26a14360f1b3bb546934467a50039ab09e50ad8" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/ply" path="external/ply" revision="36da259d1145bf2e83b9908a4629768c205f20ec" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/ppp" path="external/ppp" revision="3d486b5dcd085e41352b9b64f2ea606f0c43d172" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/ppp" path="external/ppp" revision="28eb3e4f8379ebc738e41a3f25d7056a4498d206" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/proguard" path="external/proguard" revision="57a78f10095e6ab402a4a14cb994e95e875be3f4" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/protobuf" path="external/protobuf" revision="f66b5da2d8d0ab16d9a71b1aec639f781db3af4d" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/protobuf" path="external/protobuf" revision="61802769fdb4ef36599d1beeedb5acb9b7c43d50" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/psimd" path="external/psimd" revision="f53ac1dfca8b2703d5667bd186f0284a05510d11" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/pthreadpool" path="external/pthreadpool" revision="94500f81562850b9b727e3426d241fddcdfe0a60" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/puffin" path="external/puffin" revision="3820c9bac4c29c85bfc8c5bb99d3bf9d3ea21419" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/pthreadpool" path="external/pthreadpool" revision="a85203c348b589bfd282decff8a9525794284881" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/puffin" path="external/puffin" revision="e41898ff7ac51f174dba9d2fea092b7f169f3bd1" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/python/apitools" path="external/python/apitools" revision="9b6a69032d2a520ae6816ad1f58e985d25ed3164" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/python/asn1crypto" path="external/python/asn1crypto" revision="e601bdffcfd2d1d152f62b174843033cd9c4833e" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/python/cffi" path="external/python/cffi" revision="cb16c1f6ccbe6b48d75fd1ad0a575696e3d6b2eb" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/python/cpython2" path="external/python/cpython2" revision="f15d0f01f0db905e60300cb9d4556bf5e3a5bff2" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/python/cpython3" path="external/python/cpython3" revision="2e31e5f83d4ef377099c9e71427b7e31e1da145f" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/python/cpython2" path="external/python/cpython2" revision="6a4b58d73dbe1ac4749a5084b4fca8adb03d3294" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/python/cpython3" path="external/python/cpython3" revision="f6ed9b4958fa74a3689f0a0d7b576a78788c37cf" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/python/cryptography" path="external/python/cryptography" revision="7dee80aacf672502e4f2a482c7a1cdce37e1b0bb" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/python/dateutil" path="external/python/dateutil" revision="b84c56b4c0ac9aab601bba55dd8853936ebe4735" upstream="master"/>
   <project dest-branch="master" groups="vts,pdk" name="platform/external/python/enum34" path="external/python/enum34" revision="63fe0ccce104a639e52df98ead5b9c3f766aad7b" upstream="master"/>
@@ -358,159 +366,180 @@
   <project dest-branch="master" groups="pdk" name="platform/external/python/pycparser" path="external/python/pycparser" revision="dee39841b46ee90a30a49ae76f73d106ed49fc43" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/python/pyfakefs" path="external/python/pyfakefs" revision="bdcd7c74a67b95fb791e7a4a561b9d52fb71873d" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/python/pyopenssl" path="external/python/pyopenssl" revision="93db1979ffb49a985612aa620751dfbc0364b5e4" upstream="master"/>
-  <project dest-branch="master" groups="vts,pdk" name="platform/external/python/rsa" path="external/python/rsa" revision="70615f0491ec1dafe7302d863a49b6714a01166b" upstream="master"/>
+  <project dest-branch="master" groups="vts,pdk" name="platform/external/python/rsa" path="external/python/rsa" revision="248aba47a609d40ca1fc9fce4e6ca35935ca71d1" upstream="master"/>
   <project dest-branch="master" groups="vts,pdk" name="platform/external/python/setuptools" path="external/python/setuptools" revision="8071e9702a76e00784614c5e8b2a41cad067c57d" upstream="master"/>
   <project dest-branch="master" groups="vts,pdk" name="platform/external/python/six" path="external/python/six" revision="3c3dcf66d38a890d514cee3af26918065b7a49af" upstream="master"/>
   <project dest-branch="master" groups="vts,pdk" name="platform/external/python/uritemplates" path="external/python/uritemplates" revision="830eeb749d91cded576cac5b4732d8c3ed01953f" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/rappor" path="external/rappor" revision="78b7807811112422a2ee4e684578f6e80f7116b8" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/replicaisland" path="external/replicaisland" revision="f5e2eba7a1a4f1bcf2a9cd0ddc2aa3f7a3584b5b" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/rmi4utils" path="external/rmi4utils" revision="7df67699dd12c735d795b041983a7f2ac134c28a" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/external/robolectric-shadows" path="external/robolectric-shadows" revision="71375a719f7f5d5c7997464976924f8f1cb69bf9" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rnnoise" path="external/rnnoise" revision="8bb5ddeee0d3a1736e245043538b32c92124efa2" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/external/robolectric-shadows" path="external/robolectric-shadows" revision="6c3c5b224f2b8e69642ec38c0c03bdb3bde6a052" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/roboto-fonts" path="external/roboto-fonts" revision="9cdb1e8c1f52c28b4b22ac23ffb62deb20e77c00" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/rootdev" path="external/rootdev" revision="83ea168ed50e11192a101ffe1deba658247fef76" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/aho-corasick" path="external/rust/crates/aho-corasick" revision="cb9f5a249ca5811bb4df53e351e0a70842f94fa6" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/anyhow" path="external/rust/crates/anyhow" revision="aa253f5bf34920b8c0fbbe04bfa45b59da6d4863" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/bindgen" path="external/rust/crates/bindgen" revision="13ac27fde01dfa77491d90751dd35710fda93485" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/bitflags" path="external/rust/crates/bitflags" revision="4bf8ff97c216dbd84033a05d33ac515a3ad445db" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/bytes" path="external/rust/crates/bytes" revision="01ae379526218e7f6ca28510b6c06098419b7380" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/cexpr" path="external/rust/crates/cexpr" revision="573e67cbde517c8c67ab6fe71fe81fc35b67cc43" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/cfg-if" path="external/rust/crates/cfg-if" revision="5d73ec2453d18ea185ea21ee5c1da60537255775" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/clang-sys" path="external/rust/crates/clang-sys" revision="1f45ac1e33c82eb2ab634520804ebf1ebd5936e0" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/clap" path="external/rust/crates/clap" revision="a5d0c0d86295e356fde9dec84426b381c3aed6f8" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/codespan-reporting" path="external/rust/crates/codespan-reporting" revision="e439fdf4c61214c024b36a5ec956ba42e9cc7ee7" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures" path="external/rust/crates/futures" revision="a0954fceb6efb2ce21c9aa2d243e655b1b5c2a43" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures-channel" path="external/rust/crates/futures-channel" revision="323bdc9c12210c2a33ece3ef38e8b6e40067e9a9" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures-core" path="external/rust/crates/futures-core" revision="9f6e7b26f1e10b685ffe2bde48461b8b6ae55813" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures-executor" path="external/rust/crates/futures-executor" revision="5eabf54da327295507d20148267fc3aeb3c531b0" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures-io" path="external/rust/crates/futures-io" revision="1f112548fcc48ec793a8c2b4bcbb64f34be102d6" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures-macro" path="external/rust/crates/futures-macro" revision="ae9c9db10e1677aaf2e7a4e1166a8b08606934ed" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures-sink" path="external/rust/crates/futures-sink" revision="8218bafd45fd0141541536ac3ff876ffba257fc4" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures-task" path="external/rust/crates/futures-task" revision="687af7ec7ac57fbfe0dc76a1729d2c01a3001c1c" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures-util" path="external/rust/crates/futures-util" revision="8c390197cea9dd7885d0c29ddcc41f4a878643ea" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/glob" path="external/rust/crates/glob" revision="36463de9e289d089fa31feebe9f3ef2a0d67dffd" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/heck" path="external/rust/crates/heck" revision="b9c6c14cca18afa346c1fc036b90c626979a8803" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/lazy_static" path="external/rust/crates/lazy_static" revision="55808de13b10e40561bd5feb6d12353242dc40c8" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/lazycell" path="external/rust/crates/lazycell" revision="7272f68ca01edfafbcbb2c70e096b1ffdc12e153" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/libc" path="external/rust/crates/libc" revision="df60ee8fa2660f85e97f42d212bcd9485f77eb29" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/libloading" path="external/rust/crates/libloading" revision="1c1d4f9ece9a2d22318259671a99ba3a16f3f7e3" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/log" path="external/rust/crates/log" revision="d148f11990aff74eb158bd3b69161751633a6d85" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/memchr" path="external/rust/crates/memchr" revision="42a073769a9b55454e8ba6e3341c35c55f227522" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/nom" path="external/rust/crates/nom" revision="39694bcc4c78bd88f2ed5415d05899a6c1a530f3" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/once_cell" path="external/rust/crates/once_cell" revision="7391d01fda473f5d306f0f5025001549a83c9f56" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/paste" path="external/rust/crates/paste" revision="1fd91968ea6f41c37406bbb08c3ecba70d4dab10" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/paste-impl" path="external/rust/crates/paste-impl" revision="87d753e44e655e276a370a6d79cc78a290fc26c0" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/peeking_take_while" path="external/rust/crates/peeking_take_while" revision="126426f20678c481c33ef765c7824b7811d9a362" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/pin-project" path="external/rust/crates/pin-project" revision="171c5f5dc158a547145796e9909044a0ade7844d" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/pin-project-internal" path="external/rust/crates/pin-project-internal" revision="3df16d58227b7b77c136c32329fa17844f907f10" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/pin-utils" path="external/rust/crates/pin-utils" revision="d296d1a7dacd3819d3dcec556fa9b8a698b035b9" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/proc-macro-error" path="external/rust/crates/proc-macro-error" revision="93b1f0ef9a6eed60af45b4fbc4886b718a24f2d4" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/proc-macro-error-attr" path="external/rust/crates/proc-macro-error-attr" revision="9d3a11dc81c824ce9bbd3bba0dd5bdc8d6e9c0b6" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/proc-macro-hack" path="external/rust/crates/proc-macro-hack" revision="b952c321d8b57c9ce9352d0a272a1a53c8266016" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/proc-macro-nested" path="external/rust/crates/proc-macro-nested" revision="29383009a49b7c89f6f6dca2d1dcf247c80992eb" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/proc-macro2" path="external/rust/crates/proc-macro2" revision="962d301f33607c4d68b4596f273d48798c5bf817" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/protobuf" path="external/rust/crates/protobuf" revision="e97eb59d5ef6d56df05edde7356c6310d9a2cbe3" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/protobuf-codegen" path="external/rust/crates/protobuf-codegen" revision="576a7f7dce357413fefb159b8fcb1540c1462162" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/quote" path="external/rust/crates/quote" revision="0fd496fa286bf5dd7e545da5b88dbfd9ba8c8a11" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/regex" path="external/rust/crates/regex" revision="caad50e8481d946e3eae0f12f9c7a025b65781b9" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/regex-syntax" path="external/rust/crates/regex-syntax" revision="7095120865d17d196f4906fb468aecd0e6d28a47" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/remain" path="external/rust/crates/remain" revision="53d2f11df48277a6dbb3312b5100bc94bb5582a8" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/rustc-hash" path="external/rust/crates/rustc-hash" revision="a0d91f2e836ba9c3aaf1e6064b2678b9fef12d05" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/shlex" path="external/rust/crates/shlex" revision="4a1df538283b69c03c95626e27ba7c260120a074" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/slab" path="external/rust/crates/slab" revision="eb50abb49786dae3ce91cc3d16646737147c18a7" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/structopt" path="external/rust/crates/structopt" revision="cb442cb649ae8436bc80bc1955c2ba83d960d0a0" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/structopt-derive" path="external/rust/crates/structopt-derive" revision="71df68510feded6e618655da3fc45a120ed3a96f" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/syn" path="external/rust/crates/syn" revision="62de5e50c9199bed18111720a0429e879c28445a" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/syn-mid" path="external/rust/crates/syn-mid" revision="cbffc4ca6ed29ab02e9507c891c17dfb6b23a0bf" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/termcolor" path="external/rust/crates/termcolor" revision="36010963066b77297312dd9739d5b49dbbfcb3be" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/textwrap" path="external/rust/crates/textwrap" revision="63306dba15332334b755f8e22882c8188f96cf23" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/thiserror" path="external/rust/crates/thiserror" revision="deee91e403b751dc683add63c3e6ae75de3c8ca8" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/thiserror-impl" path="external/rust/crates/thiserror-impl" revision="9d1e484920fd82effd3f4cf4438b1e73edeb1e0c" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/thread_local" path="external/rust/crates/thread_local" revision="c5c8a04104544a2aa9b827780f7fa213f810ae2e" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/unicode-segmentation" path="external/rust/crates/unicode-segmentation" revision="ed985d4a5a866c02a41fc9a7585bd8ebee30ed2a" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/unicode-width" path="external/rust/crates/unicode-width" revision="75ec7601c79e594edd0a4ccc03bf95bff579df4b" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/unicode-xid" path="external/rust/crates/unicode-xid" revision="11f33051c20ec4919e54c94e118a186c3cb28db0" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/which" path="external/rust/crates/which" revision="f2f95748422b349a3f3ef4ea3b0b55faa4d4ea44" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/rust/cxx" path="external/rust/cxx" revision="c46c875e902c1216836408be7e4abad616f886ca" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/aho-corasick" path="external/rust/crates/aho-corasick" revision="4fa3c48a1f9a4f7dcd7a44c639eabca7d7b067c6" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/android_log-sys" path="external/rust/crates/android_log-sys" revision="0d0b5b7f1efc10f2f525a709eff2e3bcf6e8ca36" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/android_logger" path="external/rust/crates/android_logger" revision="b5d680ccbff60e2ae00bb50b8d34aad9b8412cac" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/anyhow" path="external/rust/crates/anyhow" revision="f8b20d96bedb02aa577138d25a9a2803e46e54a6" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/bindgen" path="external/rust/crates/bindgen" revision="1d9a6613078cee7ca9d4339652f00e9017812cae" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/bitflags" path="external/rust/crates/bitflags" revision="36d7307a9cff98e3378874daf8a2dc9b1bf72e5c" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/bytes" path="external/rust/crates/bytes" revision="293e2aa580e5695f179507500738a4c8fc65ad82" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/cexpr" path="external/rust/crates/cexpr" revision="b03f87edd6b71e72952539b70c100790b2580778" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/cfg-if" path="external/rust/crates/cfg-if" revision="4e7fd597623e83322a5ac74f25b746cb9b4995bc" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/clang-sys" path="external/rust/crates/clang-sys" revision="8b9513ee470ed54bbb4d329556beb62de2038ee8" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/clap" path="external/rust/crates/clap" revision="132998842e71c86fd9afc392d4e5a108527d5837" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/codespan-reporting" path="external/rust/crates/codespan-reporting" revision="beb43c0236bbb3c441422f853c7286248580b82c" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/env_logger" path="external/rust/crates/env_logger" revision="0a51576499c7b6929a5a2943fd7bf8b59117ba2c" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/fallible-iterator" path="external/rust/crates/fallible-iterator" revision="a2b75a8522c82884153e7829febf04a99d89d634" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/fallible-streaming-iterator" path="external/rust/crates/fallible-streaming-iterator" revision="70207e0ab3651101980c19dc00dfea2d3e69ba07" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures" path="external/rust/crates/futures" revision="87830524ccdd9fabd37f04afabe386b74efb73f6" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures-channel" path="external/rust/crates/futures-channel" revision="8898e153d175946e3bffb269c7f9db5f15a47138" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures-core" path="external/rust/crates/futures-core" revision="a944bcbf53a3b7fb4782dba8b6a764285dd6589d" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures-executor" path="external/rust/crates/futures-executor" revision="f1ae163e3aac7d4d0e3f96a4cf6cb7c1a146e809" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures-io" path="external/rust/crates/futures-io" revision="5107b8713fda3da90b5b8037e45a7415f806da87" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures-macro" path="external/rust/crates/futures-macro" revision="555ec8ac2c69ac3e1d91d5f9a3e2cf994156d3ad" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures-sink" path="external/rust/crates/futures-sink" revision="efbe0ef315eec2bc31ac4c0df842e4df723703f2" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures-task" path="external/rust/crates/futures-task" revision="1807259c44d3a71845694f2edf3e60d65bc0ceec" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/futures-util" path="external/rust/crates/futures-util" revision="99abb8cc837693866fad4c3150edce0769a6eeaa" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/getrandom" path="external/rust/crates/getrandom" revision="70255fc360c4b3b860bbe92f877fe2a67c1ce7f7" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/glob" path="external/rust/crates/glob" revision="12de8ffacea759b2b8058bd52edf99b3bd289860" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/heck" path="external/rust/crates/heck" revision="8bcb1ab79decf46f8602b1f50ffaaa25adda1e94" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/lazy_static" path="external/rust/crates/lazy_static" revision="015d938bc04f7a9d1524099399931a5bb7c9a1cf" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/lazycell" path="external/rust/crates/lazycell" revision="c2da9b8c19fae2731e052f8c4bbda9ad12452457" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/libc" path="external/rust/crates/libc" revision="b3092466bac6f7f00a8019cfb520153a03c496b1" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/libloading" path="external/rust/crates/libloading" revision="e1a834747d201648e0e7e667194dfa0e98c9bed7" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/libsqlite3-sys" path="external/rust/crates/libsqlite3-sys" revision="0b88d5a330abc59cc94ce3e33d85b3a892915a9f" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/linked-hash-map" path="external/rust/crates/linked-hash-map" revision="63a133aab83257e3434efa777a6dfd13c0d98cc8" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/log" path="external/rust/crates/log" revision="029e59774024f812e8cd01728602f1525df0ccb0" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/lru-cache" path="external/rust/crates/lru-cache" revision="64a9d14b0f3709d6c859eb41e46f82f0a2fee62f" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/memchr" path="external/rust/crates/memchr" revision="5497646d768e921000165192435e6280ad7f6e57" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/nom" path="external/rust/crates/nom" revision="ceefd8bbe3d7a06f3dc31e20c852fac4ef779075" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/num-derive" path="external/rust/crates/num-derive" revision="306be67b451090513d26c4211dda60305148accc" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/num-traits" path="external/rust/crates/num-traits" revision="40adaa744d1ec48c4d580d69d53645b718da31ca" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/once_cell" path="external/rust/crates/once_cell" revision="517fe9d8bb8400e7514ff3feb6fe8f451c7768a4" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/paste" path="external/rust/crates/paste" revision="41177158944274fd37d9160370611a61d68f24e7" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/peeking_take_while" path="external/rust/crates/peeking_take_while" revision="1f1191e14fdddfa4ff77d28c8ba7e514e1a03ecd" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/pin-project" path="external/rust/crates/pin-project" revision="c9e44565a7c05c4325d8de85598fc4ecded70d58" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/pin-project-internal" path="external/rust/crates/pin-project-internal" revision="8b0a20e7d043929696defab3305e160ec97aeb8c" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/pin-utils" path="external/rust/crates/pin-utils" revision="8f8d97660e7300820833546bfda156898289450c" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/ppv-lite86" path="external/rust/crates/ppv-lite86" revision="8ab91e39f7b5eece97d349c8aec5b61e663dc98b" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/proc-macro-error" path="external/rust/crates/proc-macro-error" revision="b41c4c1dd97e5106ca94b635ff926e97a71f721f" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/proc-macro-error-attr" path="external/rust/crates/proc-macro-error-attr" revision="5410e7aa8dde8a06724f0d8a70ce49ae487cea85" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/proc-macro-hack" path="external/rust/crates/proc-macro-hack" revision="e23d8e27aa74e468a0c3703e3b8fdd896a15d7bf" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/proc-macro-nested" path="external/rust/crates/proc-macro-nested" revision="ad0828c13210a3590d3e47b6de85170da5708fdc" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/proc-macro2" path="external/rust/crates/proc-macro2" revision="3a941469ab572f954ff345c66973329dba5325a7" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/protobuf" path="external/rust/crates/protobuf" revision="52aa785a3abad9e9579c742b86b06ce91b5dc226" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/protobuf-codegen" path="external/rust/crates/protobuf-codegen" revision="35dedf6a776ce77be6026b45a88fc3710c2209a0" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/quote" path="external/rust/crates/quote" revision="d1061a6f15d42da3938bd97a00c4b9d285b9aacf" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/rand" path="external/rust/crates/rand" revision="bb9a33484a8c7390c8f63b2a896b174c8e37c2f4" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/rand_chacha" path="external/rust/crates/rand_chacha" revision="dfcb59bec0732c233b0a7e3b69506f26fbfc8187" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/rand_core" path="external/rust/crates/rand_core" revision="3f5054f5e12dba706096a1180698ab9c272cdda8" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/regex" path="external/rust/crates/regex" revision="2e48ab032f10a80931d56abd07616d1b87d2a0e0" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/regex-syntax" path="external/rust/crates/regex-syntax" revision="45fef2cd78769c4fcd25576994411246ba5cc275" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/remain" path="external/rust/crates/remain" revision="ec82257245980c58c38039f1d16cbb57be860442" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/rusqlite" path="external/rust/crates/rusqlite" revision="22020f0cc8c5a0cc32eb99a5e4c415c61e3cb14d" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/rustc-hash" path="external/rust/crates/rustc-hash" revision="ad1f4a661c4e7ce9a4ce6916c4ee999085bbb69b" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/shlex" path="external/rust/crates/shlex" revision="25207b9171391d5b7cb8b99d186845e8aaa95a9f" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/slab" path="external/rust/crates/slab" revision="5f8545e2164d5dbaf0dde5b12cbd3ae5dd16e445" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/smallvec" path="external/rust/crates/smallvec" revision="1e6392f2309bfdba1424545c48160f3e3073caf8" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/structopt" path="external/rust/crates/structopt" revision="54ad99605fc760bfc7c6d9630615500b18b7d6b1" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/structopt-derive" path="external/rust/crates/structopt-derive" revision="dd4ec24ddb86aef5848addb260cb1a7dcafe718d" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/syn" path="external/rust/crates/syn" revision="7fa13b183f664d3a218ea170d711a349ed87bd98" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/syn-mid" path="external/rust/crates/syn-mid" revision="692021126c38792a9b20cc341372e07d01b3c450" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/termcolor" path="external/rust/crates/termcolor" revision="add50e0e3e88504ec0ff8264f78f9412dde78fc0" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/textwrap" path="external/rust/crates/textwrap" revision="32c95abc5aa5dd6b284630f8d6e7eee5b8cf0213" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/thiserror" path="external/rust/crates/thiserror" revision="47490e9cd78ff6e3fba2cd8df2b15ba535925be7" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/thiserror-impl" path="external/rust/crates/thiserror-impl" revision="88e26aa7877e36759e95bd6d001b8016fb820248" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/thread_local" path="external/rust/crates/thread_local" revision="f9dadd41ff646d10e372ba4b993fe5979e3ca1a0" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/time" path="external/rust/crates/time" revision="f04496a66b755c2a3e8e484b1cbd4189a734d7cf" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/unicode-segmentation" path="external/rust/crates/unicode-segmentation" revision="8b3a22af4d97e960b0e1e1d384d93ba43bb711e6" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/unicode-width" path="external/rust/crates/unicode-width" revision="085eaa2d16aebcbab96208ad4116278944de7c4d" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/unicode-xid" path="external/rust/crates/unicode-xid" revision="fed503e5e9b6c600a7b625e1d9ba60ad201b37b6" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/crates/which" path="external/rust/crates/which" revision="8b6eb89f36d32d6c35dea1710c284856b67b9293" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/rust/cxx" path="external/rust/cxx" revision="073210719e1cf8f5aa00cfb5ce875a8c04926877" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/external/scapy" path="external/scapy" revision="1c94e2d5bb85cb4902bb1e3a5795e86999525b97" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/scrypt" path="external/scrypt" revision="4436f99cac9d4626e465260e8aad6a0ff8aed2cf" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/scudo" path="external/scudo" revision="31f2472659392c7cddf5159e64e26aa0b36fa6a8" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/scudo" path="external/scudo" revision="e4ac106f6027f447633620c7b3d0ddba4810eb6f" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/seccomp-tests" path="external/seccomp-tests" revision="1e1986f0dbd1790d142cdae476e08bbaf108869c" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/selinux" path="external/selinux" revision="8a98d8ce5ff028c9c0b2766563b1e078469e0f06" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/selinux" path="external/selinux" revision="ed5407a02478ba5685321d83a4ed84f11d9e62a2" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/setupcompat" path="external/setupcompat" revision="4a6e4e804f30dfac6c250685a3453e8fb5c2ee32" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/setupdesign" path="external/setupdesign" revision="ca77fb97d2f18998cc1a6875165b8ada6d697800" upstream="master"/>
   <project dest-branch="master" groups="pdk,qcom_msm8x26" name="platform/external/sfntly" path="external/sfntly" revision="fffe41ea62e1d28dae7d246453706700bb8cf894" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/shaderc/spirv-headers" path="external/shaderc/spirv-headers" revision="b8530f4af8fa45712a2c869b0ebb81f2c5be0969" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/shflags" path="external/shflags" revision="3dac286b93162f3ea66f52c2f4dd094c87fd755b" upstream="master"/>
   <project dest-branch="master" groups="pdk,qcom_msm8x26" name="platform/external/skia" path="external/skia" revision="efdb3fb8a591beabdea4aa9240b3a6c9e10567c4" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="cts" name="platform/external/skqp" path="external/skqp" revision="e7114976e58986f7301f2241b8f62ccfb1fdd298" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/sl4a" path="external/sl4a" revision="b0b7c6d0694072fe56a88803d11430a3953db177" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/slf4j" path="external/slf4j" revision="5dacf58509da9998ef9bf4c4264a36382c2e3a10" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="cts" name="platform/external/skqp" path="external/skqp" revision="25bec16283807e794c3425dcad8ee81c669faa6b" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/sl4a" path="external/sl4a" revision="e68776ccc6a32da8806b30eb8fe26465c7d580e9" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/slf4j" path="external/slf4j" revision="ba26eda702513d3c4594b9a3e8ea71849dd7de86" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/smali" path="external/smali" revision="2da1720fb501e38495e342882f83bdafdf9ec812" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/snakeyaml" path="external/snakeyaml" revision="ae7416a6fc1e45582e78e9612e328bae92466ec9" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/sonic" path="external/sonic" revision="6cfc159731330085acf6744093aea30e208762ea" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/sonivox" path="external/sonivox" revision="55d32873cd726801054133e98ab49b4272a9ca72" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/sonivox" path="external/sonivox" revision="e700ed155e181c19ae6cf7c0333ba2c12e795207" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/speex" path="external/speex" revision="3621ece4451055ee97c5d56f9ca35ef06d3d092a" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/sqlite" path="external/sqlite" revision="d7972b2e743d922276e76d2d4318bf0976486452" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/sqlite" path="external/sqlite" revision="fac00184473f1d8553eb527c0eade2c4060c40b6" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/squashfs-tools" path="external/squashfs-tools" revision="b27e9296bdf70d85b02af711d93c11ec85b8522c" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/strace" path="external/strace" revision="e862cfa113f17f40b911c8e58b3babbb98e67263" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/stressapptest" path="external/stressapptest" revision="4ac7a2a986e54029c100630c61e91e7edb4f8948" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/external/subsampling-scale-image-view" path="external/subsampling-scale-image-view" revision="ba09fe21ff5114f27aae1e5476dce9cf11530f46" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/swiftshader" path="external/swiftshader" revision="6cc15729d8e8c798c69a689ec0722639c1b065c5" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/swiftshader" path="external/swiftshader" revision="770764a21333107567a8022bbb025c623ef94dfd" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/tagsoup" path="external/tagsoup" revision="8d79f4b5dead5a59c57a8b0604f0fcc294ce6886" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/tcpdump" path="external/tcpdump" revision="01e0162be7fddf789e79e05a3312fc9b7f2ebe52" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/tensorflow" path="external/tensorflow" revision="238eeca9461f65010b19e176c0eab98176498598" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/testng" path="external/testng" revision="be3ab79b9188e8168fa95f94ab80e7a6fd39fbaf" upstream="master"/>
+  <project clone-depth="2" dest-branch="master" groups="pdk" name="platform/external/timezone-boundary-builder" path="external/timezone-boundary-builder" revision="671355f22a1368e27b8c588bfab35abf30aab0f0" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/tinyalsa" path="external/tinyalsa" revision="17dbe121ba3113b5868a68373360f700f9fe9241" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/tinycompress" path="external/tinycompress" revision="f7b937d32da1e4486c68893f0b0bda4f69b2b41a" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/tinyxml" path="external/tinyxml" revision="74d07fafdc71a85d30f57c24bec44a51b8d6b1ad" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/tinyxml2" path="external/tinyxml2" revision="0ad38bb14c0bea2bcfda371bdceb5627350e417e" upstream="master"/>
-  <project dest-branch="master" name="platform/external/toolchain-utils" path="external/toolchain-utils" revision="0c0e1d69337bb8200a65815628b019b19ae20e0d" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/toybox" path="external/toybox" revision="574e49ea35ef9a59245a72a28d39f711a3625fee" upstream="master"/>
+  <project dest-branch="master" name="platform/external/toolchain-utils" path="external/toolchain-utils" revision="b8e15db27661a92ec12ae2af66bc6987929c87f8" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/toybox" path="external/toybox" revision="4443a9f2a5a005e71bc077525a0eb499efee01ae" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/tpm2-tss" path="external/tpm2-tss" revision="13b6223a586bc61841018c824cfba6fd99fc9071" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/tremolo" path="external/tremolo" revision="3575027a377edb8e9ba994237f4ccac816621888" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/turbine" path="external/turbine" revision="0c812a26fd54aa2022cc251a76a110105e542456" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/u-boot" path="external/u-boot" revision="9a7fc96d202d97176325e1cdc1e122187a08350d" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/tremolo" path="external/tremolo" revision="cbac9982e2dbf03f430eb23cdbc274927cd56be2" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/turbine" path="external/turbine" revision="b4330c4fd8d6e2d0c996d61561bbda575f8ec362" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/u-boot" path="external/u-boot" revision="c3eb0fd9cb76f9f6f52c7e74d47d558a510b834e" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/ukey2" path="external/ukey2" revision="85debd146d63e58dfefea5b5392d7b988ee8149d" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/unicode" path="external/unicode" revision="14a6c6a89cd98d7946b087cac82307e22fc5f810" upstream="master"/>
   <project dest-branch="master" name="platform/external/universal-tween-engine" path="external/universal-tween-engine" revision="b2ad896a29d685f14252f1cea90304d98cf1151e" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/usrsctp" path="external/usrsctp" revision="398ff28110c4976eae10c44f68803b0a0e8c014d" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/v4l2_codec2" path="external/v4l2_codec2" revision="c4a6d6e39e36512179235a2f66cd240632f82e19" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/v8" path="external/v8" revision="05eb12df018a5ac12e1629d468451d3139b311fb" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/v8" path="external/v8" revision="a84742873671f2586071ee1a2b54147f43c82ae2" upstream="master"/>
   <project dest-branch="master" groups="vboot,pdk-fs" name="platform/external/vboot_reference" path="external/vboot_reference" revision="b6b998eb942028c70e5baa7300f9a924e3912bcf" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/virglrenderer" path="external/virglrenderer" revision="4c605a07e2d30e225cc908b48596e10450dea979" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/virglrenderer" path="external/virglrenderer" revision="3df24aed668937f5a80b0d3aefee35cfeb515664" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/vixl" path="external/vixl" revision="54f58fb13dade10ffabdc72415cee5d4a746c017" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/vogar" path="external/vogar" revision="6e3ba4530367dcbff5392952b8e487090cd58b40" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/volley" path="external/volley" revision="c60e1cfe5bae249f520b5a4fca35e4f9155198c1" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/vulkan-headers" path="external/vulkan-headers" revision="070e34b31ad9a3553b6eed7f64984b80086ac0df" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/vulkan-headers" path="external/vulkan-headers" revision="9cb71ab35167cbd3f2d744835352eedab9fd4091" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/vulkan-validation-layers" path="external/vulkan-validation-layers" revision="28f8a95f08b8aa4a9f4ccad4096736b50e283473" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/walt" path="external/walt" revision="b45616374afe02fc04da21636503d034c9c8c8dc" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/wayland" path="external/wayland" revision="347c7cd153ed6547eb3a54956e9b7d2bdb96228a" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/wayland-protocols" path="external/wayland-protocols" revision="6a3453e2cc730e7a36a152ef811dc5aa4a05f394" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/wayland" path="external/wayland" revision="cd6809020da4436724334ebb18acbd90ecad46a1" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/wayland-protocols" path="external/wayland-protocols" revision="dad011780d0d848ee3c9135b1be25fe4d065ea7b" upstream="master"/>
   <project dest-branch="master" groups="pdk,qcom_msm8x26" name="platform/external/webp" path="external/webp" revision="e1bc8b4508110e89aee708f04af91ce5421fb4cb" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/webrtc" path="external/webrtc" revision="862f8febb19e360edb5c63e74ef03e874a161465" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/webrtc" path="external/webrtc" revision="081f2a69ce6cc56d2c25108cce6318667db5e8ff" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/webrtc_legacy" path="external/webrtc_legacy" revision="19e0be551bfc707c791c823c48f16a3091f7518f" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="2ecf09724e23a3c8d96a2c64e92cf9d826ce9b63" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/wycheproof" path="external/wycheproof" revision="8a6152b03aac5cccb92cc88fd9af6e2b739b96c8" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/xmp_toolkit" path="external/xmp_toolkit" revision="4eafdf35a193cd3068bf77d8d00038be1d9b39b2" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/xz-embedded" path="external/xz-embedded" revision="ff3dce8e7f46fa2283e15f8048caa4b00f45d896" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/xz-java" path="external/xz-java" revision="bd7892bb8927360cd34805bc332039154a2110e0" upstream="master"/>
   <project dest-branch="master" groups="vts,projectarch,pdk" name="platform/external/yapf" path="external/yapf" revision="10b199108ab23e5658c35197164c6bec93352070" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/external/zlib" path="external/zlib" revision="f3a62bc02acae5f47ece8ff3e3bbcaf7de38c961" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/external/zlib" path="external/zlib" revision="28320305b90e717b351c5538358a840ec3620bc0" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/zopfli" path="external/zopfli" revision="b481a8f686da1cb148ff09eb10ca02198c6bdb49" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/zstd" path="external/zstd" revision="da821d773bfbad63841ecf7a765d56d19acfe47d" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/external/zxing" path="external/zxing" revision="dcb3fa2622a5aab0fc99fcf044e6ec64131ee4fc" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/frameworks/av" path="frameworks/av" revision="853ef5c87d3029206d772f39750fe0cdbb63e9bb" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/base" path="frameworks/base" revision="8b7c9a2f87edc288dc0b48505c2b6787e5aa42be" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/frameworks/compile/libbcc" path="frameworks/compile/libbcc" revision="080cb723ea2a09d67aa2a1b4e9f978fc12c1d977" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/frameworks/compile/mclinker" path="frameworks/compile/mclinker" revision="da5dd7a6e1abc232e01b6c5d3210bcf040027c9f" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/frameworks/compile/slang" path="frameworks/compile/slang" revision="5e8a215cf062b811e59d203c7f9124cb16570553" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/frameworks/av" path="frameworks/av" revision="853e7579b42d5b878d8c5d559fc45f223f4b9813" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/base" path="frameworks/base" revision="38edcd001afbf3185186c4366454bd8739331fc6" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/frameworks/compile/libbcc" path="frameworks/compile/libbcc" revision="24835798f62ff404162ad5308248743e5fdc9d68" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/frameworks/compile/mclinker" path="frameworks/compile/mclinker" revision="a4d0f51e53d28a88450c574f118ca73cc311d7e9" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/frameworks/compile/slang" path="frameworks/compile/slang" revision="c7da5c24dcdb929500d5b76da94e80ab096c9f36" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/ex" path="frameworks/ex" revision="d535f66f7e026f0bb19aaa39b91d83e05bd4b0ff" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/frameworks/hardware/interfaces" path="frameworks/hardware/interfaces" revision="f60bf9f56f59f80bec6bacb54ef3446a25d4bd3d" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/layoutlib" path="frameworks/layoutlib" revision="0a0fec058ce4ce0b9ad2d60dea06307498dee064" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/frameworks/libs/native_bridge_support" path="frameworks/libs/native_bridge_support" revision="532cbffd1dfd48ec12dec2b4aa2f51e1f55b61b4" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/libs/net" path="frameworks/libs/net" revision="a91cbe7f5f20073ccfe1d675c0650cdfa4a90a93" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/frameworks/hardware/interfaces" path="frameworks/hardware/interfaces" revision="64a531c6a283fa027abf5cca6c70e323297220c8" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/layoutlib" path="frameworks/layoutlib" revision="7e3df3631735053ae1a945cd5baed109a743b93f" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/frameworks/libs/native_bridge_support" path="frameworks/libs/native_bridge_support" revision="3414fdb1c586f30b8a6cd6517323c6eac943eb43" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/libs/net" path="frameworks/libs/net" revision="96027df8a444f8a63d816018bd12db05a761bdbb" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/minikin" path="frameworks/minikin" revision="485f24291298efd5cecf5c0a9898a35ba241e0b0" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/frameworks/ml" path="frameworks/ml" revision="2106b542110323a67c3cc4170ef810268a86f76e" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/frameworks/ml" path="frameworks/ml" revision="45482cbe28e51051740b30b3091c8f0b43f891a8" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/multidex" path="frameworks/multidex" revision="70cd958708d114be38febd015485f582f1165bee" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/frameworks/native" path="frameworks/native" revision="464130b09d5ecd266c5ea5a62162760a4aac2946" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/frameworks/native" path="frameworks/native" revision="52e3b47cae759317fb4a87df25568b897b132585" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/frameworks/opt/bitmap" path="frameworks/opt/bitmap" revision="e9850af1278e499e427d08dbf40244f3622bd6db" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/calendar" path="frameworks/opt/calendar" revision="1aea8315ebe9cca6e9462ab02e9f4caf20c8cd58" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/frameworks/opt/car/services" path="frameworks/opt/car/services" revision="e01e933a67ce40bdb266b4cf2c6a63036132958a" upstream="master"/>
@@ -518,29 +547,29 @@
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/chips" path="frameworks/opt/chips" revision="e337b2037dda34bb2a2c98d01c8b6ea18cc8179a" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/colorpicker" path="frameworks/opt/colorpicker" revision="e3c6e799edbff3f633f03f0f0f394a74b2065d36" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/frameworks/opt/net/ethernet" path="frameworks/opt/net/ethernet" revision="67c1ef1f1ff26cbf02dbb880ab7d27f06f7188cb" upstream="master"/>
-  <project dest-branch="master" groups="frameworks_ims,pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/net/ims" path="frameworks/opt/net/ims" revision="881b57b1f8b5c9f5acdf17e36c8029199812c80a" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/net/voip" path="frameworks/opt/net/voip" revision="9d0f1c35dfa4b56d7a74dc8748790205f58626bc" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/frameworks/opt/net/wifi" path="frameworks/opt/net/wifi" revision="702f97dc86b90ae1b339ef3808c8a35d8c807eef" upstream="master"/>
+  <project dest-branch="master" groups="frameworks_ims,pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/net/ims" path="frameworks/opt/net/ims" revision="c41c0c299c0d3c538a72af04c044bbf079ae6dd0" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/net/voip" path="frameworks/opt/net/voip" revision="db05c2d7a83409b50e45cbc75c50497d46aececf" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/frameworks/opt/net/wifi" path="frameworks/opt/net/wifi" revision="287b7337f73fc2b4d6d8a5fb45c3c3b375670c64" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/photoviewer" path="frameworks/opt/photoviewer" revision="c250535f2ec9716d9bd3bccd6cc87dd2fa309277" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/setupwizard" path="frameworks/opt/setupwizard" revision="481c220b0b15b5ab5808e4f0d648333c9b772307" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/frameworks/opt/telephony" path="frameworks/opt/telephony" revision="cf2122a8ae0d28546da92851da83a9c4b99f0fa0" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/frameworks/opt/telephony" path="frameworks/opt/telephony" revision="bc9bd7ef27dda3af2261698963ae3c05f2de3b28" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/timezonepicker" path="frameworks/opt/timezonepicker" revision="3b85bbb68431e734ea266499053661f1c7734564" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/vcard" path="frameworks/opt/vcard" revision="d2dde212b349a1088ad9a4f064f3c7fca50f62f3" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/frameworks/rs" path="frameworks/rs" revision="369b4ca333ba7e00284849da623bc8d90bb5acfc" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/wilhelm" path="frameworks/wilhelm" revision="d0d2b755f5fd6fa9e222f61acfe11c93539bf70b" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/hardware/broadcom/libbt" path="hardware/broadcom/libbt" revision="33ab16ebcd5f6e434ff0f5479367ef76db3bac1e" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/frameworks/rs" path="frameworks/rs" revision="1ad73cc08f1ce79028ffa11512519988ae3a26de" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/wilhelm" path="frameworks/wilhelm" revision="7d70963364a3f9d42553e36b40c544c581ae90b9" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/hardware/broadcom/libbt" path="hardware/broadcom/libbt" revision="588bb9ac1d205fe7dbe132eb14589adda92a7cf6" upstream="master"/>
   <project dest-branch="master" groups="pdk,broadcom_wlan" name="platform/hardware/broadcom/wlan" path="hardware/broadcom/wlan" revision="ef6b231056bb1bdcea293429c939d6c4396714f0" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/hardware/google/apf" path="hardware/google/apf" revision="4336dde0196f63d94df221456965c564c9392fd0" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/hardware/google/av" path="hardware/google/av" revision="7035a4da84102feddda02eeac3de1cfc53b1a0f4" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/hardware/google/apf" path="hardware/google/apf" revision="82f4e345aef14aafec68cc40fbd8dc7dce50b852" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/hardware/google/av" path="hardware/google/av" revision="fdebb8f14e38395fdce40be9c917beab42aea42c" upstream="master"/>
   <project dest-branch="master" groups="pdk,easel" name="platform/hardware/google/easel" path="hardware/google/easel" revision="792d8b327c17c8581d1ea0a3a9a1eaf128c19788" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/hardware/google/interfaces" path="hardware/google/interfaces" revision="b1e4020a6a53e9face5bd93bc89ae59c98803bab" upstream="master"/>
   <project dest-branch="master" groups="generic_fs,pixel" name="platform/hardware/google/pixel" path="hardware/google/pixel" revision="7a489f84aba93b2f6da99afabd6554045f6252bd" upstream="master"/>
-  <project dest-branch="master" groups="generic_fs,pixel" name="platform/hardware/google/pixel-sepolicy" path="hardware/google/pixel-sepolicy" revision="a3af99c63f21e27cba689f811c15c2b10f638fea" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/hardware/interfaces" path="hardware/interfaces" revision="6d4d3a20da63f454a03d3d80fce894c8e625c404" upstream="master"/>
+  <project dest-branch="master" groups="generic_fs,pixel" name="platform/hardware/google/pixel-sepolicy" path="hardware/google/pixel-sepolicy" revision="cf569344b8ae43dc41a50f4cfdcd1c465cc62828" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/hardware/interfaces" path="hardware/interfaces" revision="4a91699105dabfc1b267099c66e9214b1ed77839" upstream="master"/>
   <project dest-branch="master" groups="invensense,pdk" name="platform/hardware/invensense" path="hardware/invensense" revision="52e51c22ac7e111fad6e6e8e175bfe0e486f4979" upstream="master"/>
-  <project dest-branch="master" groups="coral" name="platform/hardware/knowles/athletico/sound_trigger_hal" path="hardware/knowles/athletico/sound_trigger_hal" revision="ff09cebd77687bd1ab64c2e0eeeeabcabbe6b4c4" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/hardware/libhardware" path="hardware/libhardware" revision="9a2cf9a81852548e1af0247d4f8fe7e9080dd3fc" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="16d0ab989858c6bb4ba24473d76622988c7d9973" upstream="master"/>
+  <project dest-branch="master" groups="coral" name="platform/hardware/knowles/athletico/sound_trigger_hal" path="hardware/knowles/athletico/sound_trigger_hal" revision="8baad7126a217ecc0f796c6ec009f270ced860f6" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/hardware/libhardware" path="hardware/libhardware" revision="a1a6f9e8196f90c6c0b5415fd8df086e3bf1c70c" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" revision="a44935a15e3d239d5c692d7de3118fea290ceac9" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/hardware/nxp/nfc" path="hardware/nxp/nfc" revision="c3e97676d6db769b773fb8c85051f55a1aaa8537" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/hardware/nxp/secure_element" path="hardware/nxp/secure_element" revision="f431470d1a2677bac9e30aba0773a3c6cee46658" upstream="master"/>
   <project dest-branch="master" groups="qcom,qcom_audio,pdk-qcom" name="platform/hardware/qcom/audio" path="hardware/qcom/audio" revision="c14a73d03387afc939988f2874648bdf491e2884" upstream="master"/>
@@ -576,23 +605,24 @@
     <linkfile dest="hardware/qcom/sm8150/Android.mk" src="os_pickup.mk"/>
     <linkfile dest="hardware/qcom/sm8150/Android.bp" src="os_pickup.bp"/>
   </project>
-  <project dest-branch="master" groups="qcom_sm8150" name="platform/hardware/qcom/sm8150/display" path="hardware/qcom/sm8150/display" revision="7681165d8ab3fe15bfa6f442ace654c9cdcadcf0" upstream="master"/>
+  <project dest-branch="master" groups="qcom_sm8150" name="platform/hardware/qcom/sm8150/display" path="hardware/qcom/sm8150/display" revision="7f2aafbff147ec2a30ca4243385ebb0b7aec1cfc" upstream="master"/>
   <project dest-branch="master" groups="qcom_sm8150" name="platform/hardware/qcom/sm8150/gps" path="hardware/qcom/sm8150/gps" revision="34ea098fe53b5118c1f294710d20f390a27f43b9" upstream="master"/>
   <project dest-branch="master" groups="qcom_sm8150" name="platform/hardware/qcom/sm8150/media" path="hardware/qcom/sm8150/media" revision="7de99155938d318c46bedd20fea3a3d736a53b23" upstream="master"/>
   <project dest-branch="master" groups="qcom_sm8150" name="platform/hardware/qcom/sm8150/thermal" path="hardware/qcom/sm8150/thermal" revision="2f27907a2770b508d3e04c76ddd41e2dd3b4af38" upstream="master"/>
   <project dest-branch="master" groups="qcom_sm8150" name="platform/hardware/qcom/sm8150/vr" path="hardware/qcom/sm8150/vr" revision="a3b38e2ced79c2098ab6418dac4e8c7c1ebe4b0d" upstream="master"/>
   <project dest-branch="master" groups="qcom_wlan,pdk-qcom" name="platform/hardware/qcom/wlan" path="hardware/qcom/wlan" revision="64500046a97842203e8a912257657753d24f7fe6" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/hardware/ril" path="hardware/ril" revision="662ce934137795798f025ef35d1c362fb5b3d917" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/hardware/st/nfc" path="hardware/st/nfc" revision="a680d24231d982ea9dc311e71f6af911b5d730ff" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/hardware/st/secure_element" path="hardware/st/secure_element" revision="edadaf5bbcad2a72e01c36d23b027501639c36ce" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/hardware/ril" path="hardware/ril" revision="d0412127b790c90a6e3b64f29691854ce19a321b" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/hardware/st/nfc" path="hardware/st/nfc" revision="d51c023419f00dca3d750f14c8425a7b7b8a4655" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/hardware/st/secure_element" path="hardware/st/secure_element" revision="2fd6e665fbeefccbd060f69c7dd42108e309e8ab" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/hardware/st/secure_element2" path="hardware/st/secure_element2" revision="bb2b822e1a815314c16ee86c2d6f3aa02b474731" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/hardware/ti/am57x" path="hardware/ti/am57x" revision="09c67206f6cb889e4c661f7f4dd6f847a0d88f47" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/libcore" path="libcore" revision="bc7847057239986260355685bb62b41fcb11f893" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/libnativehelper" path="libnativehelper" revision="430d06f39a4f536c3b985faa6d2276f47e13886e" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/libcore" path="libcore" revision="231e4fee087d98fcf0d4cbc093776bf364cf65f9" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/libnativehelper" path="libnativehelper" revision="84e576a16b5d21b1cfb875623e03bdff5f96924c" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/BasicSmsReceiver" path="packages/apps/BasicSmsReceiver" revision="0805f0c123bd84ca454eb375e90fa2313a69a8c5" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth" revision="1f699e0a1725adfbd1bc7d9b28a2b82884f0621a" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/Bluetooth" path="packages/apps/Bluetooth" revision="80a6c4d7ba21d14efbab06e77c4c6c5c342c115f" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Browser2" path="packages/apps/Browser2" revision="8a68fdaf045848376f2e31a645fb3970868842ad" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Calendar" path="packages/apps/Calendar" revision="5c87d5f3162a7aecffc4060ccaafe0eb25799569" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Camera2" path="packages/apps/Camera2" revision="19ec9b509661e0ccfeb175e765f829f95cd79542" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Calendar" path="packages/apps/Calendar" revision="27e95b5dbf44bcea7ae529c68bf8d3d8d4cf2820" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Camera2" path="packages/apps/Camera2" revision="d36fa085d6acb9976a2c3810eceef92c5daba9e1" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Car/Cluster" path="packages/apps/Car/Cluster" revision="7e1ad61d9e8984f90ca7cb139df4430e9d7fbcf0" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Car/CompanionDeviceSupport" path="packages/apps/Car/CompanionDeviceSupport" revision="68538c52302c4670060cf68120da97c17f925158" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Car/Dialer" path="packages/apps/Car/Dialer" revision="96e42e0112a724b3b415f91b940fac1dc5148f3d" upstream="master"/>
@@ -607,71 +637,71 @@
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Car/Notification" path="packages/apps/Car/Notification" revision="800e2f9334f3a0de20e9528e9cd02c4812c28e33" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Car/Overview" path="packages/apps/Car/Overview" revision="18069cf7b505946bdf5d1eb3566c7c8f201b1b9d" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Car/Radio" path="packages/apps/Car/Radio" revision="e301e0126d865e15fc748e773a52746c08f7c8d4" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Car/Settings" path="packages/apps/Car/Settings" revision="c806b655b91ef19fbf3cf17364c13be7b3a6ec61" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Car/Settings" path="packages/apps/Car/Settings" revision="093b18b3a60bda7b709b355454edf70ccd130914" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Car/Stream" path="packages/apps/Car/Stream" revision="65fcbceb6cadefcd715b7b61c0d08c8279408343" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Car/SystemUpdater" path="packages/apps/Car/SystemUpdater" revision="ad64abe7c7ada0deca3d861a68d72ca770b333ff" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Car/libs" path="packages/apps/Car/libs" revision="d62248733f5b4dceba8060dc270917e07398614d" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Car/tests" path="packages/apps/Car/tests" revision="fe3429af80780990e3961c83d5eb5bf16273af1d" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CarrierConfig" path="packages/apps/CarrierConfig" revision="aa0a1d880897f71f831d92dbd8d212f76641028a" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver" revision="3579165fa46295157df520506f9e1f308c3a49d6" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" revision="a4e1b7a9a931ccf991abc323dd9d8069896797fa" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Contacts" path="packages/apps/Contacts" revision="e8967e6a83c8fd9103001dcf6526b755cd778df2" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/DeskClock" path="packages/apps/DeskClock" revision="d706442eff1a084f1f3770aeec5a4f7b9dc83a3b" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CarrierConfig" path="packages/apps/CarrierConfig" revision="8baa947fcbbe360cd05e448b72d66a4b4d3ea377" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver" revision="36813e59e5fc918695531612032fc6640db1f847" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" revision="d557f0e7a2c0cfa56bf621280e38e9027ef17fa5" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Contacts" path="packages/apps/Contacts" revision="19cb7ef58040ea32453f8165f23b5e537a210170" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/DeskClock" path="packages/apps/DeskClock" revision="48a948b295c7927825f3b4e74826dfb8419595b1" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/packages/apps/DevCamera" path="packages/apps/DevCamera" revision="1b84f1f7fce56aae85e58d435b686d946c1f5f07" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Dialer" path="packages/apps/Dialer" revision="53884bc5302198c0583b1c59f8bfef40028fea7f" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Dialer" path="packages/apps/Dialer" revision="237d9b014c5d74a58c688abb9a9328f3b11ef689" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/DocumentsUI" path="packages/apps/DocumentsUI" revision="707f67150657020becaad9d5da87e290d085fb80" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/EmergencyInfo" path="packages/apps/EmergencyInfo" revision="0d84e9463dce4a40f47fc3920f645c8f208352bf" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/EmergencyInfo" path="packages/apps/EmergencyInfo" revision="a228eb59f9233c580a55d31f45ede58035d54d50" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Gallery" path="packages/apps/Gallery" revision="c436e2f2a7dd793db46ab8d7fd48259b2a0631e8" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Gallery2" path="packages/apps/Gallery2" revision="7a51e1fa4cbb806abcad95142e58390ca4126903" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Gallery2" path="packages/apps/Gallery2" revision="9733e9fd1828b7a75254adfc9a907f420de0601c" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer" revision="ad709f9d80fc5b84d93b691806651e9b6f2ca194" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/KeyChain" path="packages/apps/KeyChain" revision="4bd63b16a8e6a417af4e034b84bfdd7d75ba3d18" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Launcher3" path="packages/apps/Launcher3" revision="ea991a4be5bc48a079647df2d35f8ca6ef0d896b" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/LegacyCamera" path="packages/apps/LegacyCamera" revision="0d54a1dd6746faf3d679a3c0a2d36e5416834170" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/ManagedProvisioning" path="packages/apps/ManagedProvisioning" revision="b61406d10fab44d7cd9e1796f093ee90eb9bf828" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Messaging" path="packages/apps/Messaging" revision="c9e85fd21a155b30d0450f86e26a5f4693c0e28a" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Music" path="packages/apps/Music" revision="87cbf89f8ad4c62c356b6e87053cfa68422b7011" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/MusicFX" path="packages/apps/MusicFX" revision="d9f1d2d3cbf259e06c71489452aa2bfa22a979ef" upstream="master"/>
-  <project dest-branch="master" groups="apps_nfc,pdk-fs" name="platform/packages/apps/Nfc" path="packages/apps/Nfc" revision="93879fac991ca320f267b0ecb768cb0ff1e2b4c4" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/KeyChain" path="packages/apps/KeyChain" revision="7c0c35442fb278c7d63c95718af5224fdc36f5d1" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Launcher3" path="packages/apps/Launcher3" revision="af6968dcec96966e84608d9dd30a7e379cb1993b" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/LegacyCamera" path="packages/apps/LegacyCamera" revision="79a62e3c6663c3a69a4e2792c625730970046763" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/ManagedProvisioning" path="packages/apps/ManagedProvisioning" revision="6e1d96a6315ba2bbebd4853ce1150d4e6a55d767" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Messaging" path="packages/apps/Messaging" revision="4b52654e98d9fee9f99053db1be535917673fa45" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Music" path="packages/apps/Music" revision="48d693371635dd483f35d5f151599d4a92625fb5" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/MusicFX" path="packages/apps/MusicFX" revision="db9d2df722a9edc949a54540ddc8815cb692ea70" upstream="master"/>
+  <project dest-branch="master" groups="apps_nfc,pdk-fs" name="platform/packages/apps/Nfc" path="packages/apps/Nfc" revision="e919a6ff0dab23eec9fb107ddc736711fd9299ae" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/OneTimeInitializer" path="packages/apps/OneTimeInitializer" revision="9dd324bae9cdc1e608680873653c767107a687a3" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PackageInstaller" path="packages/apps/PermissionController" revision="c343b0516a0ff61500e1fd27a493ef3ca579855c" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PackageInstaller" path="packages/apps/PermissionController" revision="7dec5617a56fe3c4bf6f56a2ff6b91572f185145" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PhoneCommon" path="packages/apps/PhoneCommon" revision="6f9878dc58b9561b0ab2fff040e24cd3ec7d4ae4" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Protips" path="packages/apps/Protips" revision="7f4bc7b7bd60c06e900975908e1b06979888e859" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Provision" path="packages/apps/Provision" revision="b4bc0db4fc6e08a7640c5071525b15e8b15414f0" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" revision="dec07b4199f8e5db20b173dcdf1a00d47f8d13bf" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" revision="a82abd4128133c986213a13791a8895bddae5ec4" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/SafetyRegulatoryInfo" path="packages/apps/SafetyRegulatoryInfo" revision="db3edb6f3531446f9aa234631d6697f148bc0623" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/SampleLocationAttribution" path="packages/apps/SampleLocationAttribution" revision="e2f9e0754772bd122adfd8d06756e22ed9305d1d" upstream="master"/>
   <project dest-branch="master" groups="apps_se,pdk-fs" name="platform/packages/apps/SecureElement" path="packages/apps/SecureElement" revision="a05bb069e22abd4db7c14650d79d2ead3867c827" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Settings" path="packages/apps/Settings" revision="cd85c6436237e1cac6a5121d465be09e391a6d6b" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Settings" path="packages/apps/Settings" revision="99a7c3ef0031272872c4520e986eb00737c7fdca" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/SettingsIntelligence" path="packages/apps/SettingsIntelligence" revision="9c7a808ea96fd072e1fd68b4bcd1733f8ff4a3b2" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/SpareParts" path="packages/apps/SpareParts" revision="fd4351c6184d37684020481795248fdcb37d8ed8" upstream="master"/>
-  <project dest-branch="master" groups="apps_stk,pdk-fs" name="platform/packages/apps/Stk" path="packages/apps/Stk" revision="7b633568807a03dda2235efbcf21527989ff56b6" upstream="master"/>
+  <project dest-branch="master" groups="apps_stk,pdk-fs" name="platform/packages/apps/Stk" path="packages/apps/Stk" revision="2708362895220a5803f8987ab5b8a9b2a4fa5e9c" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/StorageManager" path="packages/apps/StorageManager" revision="2113ef90eddddb24e7c3c7b3a9e49c791335f2fe" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/packages/apps/TV" path="packages/apps/TV" revision="f11da96dc1d1083f2387de7f00f3943caf397a65" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/packages/apps/TV" path="packages/apps/TV" revision="fb7246840f26ffe0a5ef836011282b8e55e2cf3b" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Tag" path="packages/apps/Tag" revision="2e1a407490ee6c9f43b3521a2639f8755f523eb0" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Terminal" path="packages/apps/Terminal" revision="54bb27fdc57826240561175f827f88700c83b06e" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/packages/apps/Test/connectivity" path="packages/apps/Test/connectivity" revision="7399fcc91fbe474f819e3b45df27c8845360925c" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/packages/apps/Test/connectivity" path="packages/apps/Test/connectivity" revision="abd1a25df082a07dd27554d84f412f7b10531e95" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/ThemePicker" path="packages/apps/ThemePicker" revision="a66d3ffcbff158f0eb0482741348b8c3ccc99dd0" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/packages/apps/TimeZoneData" path="packages/apps/TimeZoneData" revision="f23cfe134712cef43766dc1e8e79d5f220ba736d" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/packages/apps/TimeZoneData" path="packages/apps/TimeZoneData" revision="9d6fa58ffc0ab23a75e092b3fe4b92170a5e481e" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/packages/apps/TimeZoneUpdater" path="packages/apps/TimeZoneUpdater" revision="88da0bd35394bb4ffc5de8167e6a2b9d060c1686" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Traceur" path="packages/apps/Traceur" revision="f25b1345218efd8f3abcc48842dadd487858d1d6" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/TvSettings" path="packages/apps/TvSettings" revision="9f61e1a476f93b6083b42dcabb5237f1b501a186" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/Traceur" path="packages/apps/Traceur" revision="996d5c31a8f741604a81e862f3ada9c762de5137" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/TvSettings" path="packages/apps/TvSettings" revision="8dd83d670f1b4b28d434bb2086ea713ac529c65d" upstream="master"/>
   <project dest-branch="master" name="platform/packages/apps/UniversalMediaPlayer" path="packages/apps/UniversalMediaPlayer" revision="b82ed64e09ef725b0c675f3fc30296c4844befae" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/WallpaperPicker" path="packages/apps/WallpaperPicker" revision="4292a37c4b9d746fff958de315604aa957361314" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/apps/WallpaperPicker2" path="packages/apps/WallpaperPicker2" revision="a84f0b107f606a98adb857e35b1e71efbdee3200" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs" name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" revision="daadf71015bf37651ed81a2d5877b480736db5cd" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs" name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" revision="b01f678ca850d970f1bd47fd7e4a6aeacd72f3af" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/inputmethods/LeanbackIME" path="packages/inputmethods/LeanbackIME" revision="38afee1136642059a6c3d23a6bc38b0786ad29ff" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/packages/modules/ArtPrebuilt" path="packages/modules/ArtPrebuilt" revision="491a40e7de77dac8666f05aab45e6e71e57ceb49" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/CaptivePortalLogin" path="packages/modules/CaptivePortalLogin" revision="9dde22b5d34125f0806cb8aca53b25927f1bf259" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/packages/modules/CellBroadcastService" path="packages/modules/CellBroadcastService" revision="8bb75ea88a9f4370985b1af5b1f8ca88265e160f" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/CaptivePortalLogin" path="packages/modules/CaptivePortalLogin" revision="e59c09d1ef1ce3123810b2d81428e15e7a1ad7c9" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/packages/modules/CellBroadcastService" path="packages/modules/CellBroadcastService" revision="26848c5022821a557cd36e9a5a567cf76e6f25f7" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/Cronet" path="packages/modules/Cronet" revision="f22adf20638c1b564bfd9766ed5aabf23a1aab9b" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/DnsResolver" path="packages/modules/DnsResolver" revision="5b757efb3fff2f1f430ed7c78dd7b755b50c774a" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/DnsResolver" path="packages/modules/DnsResolver" revision="957333d2a99861bc9e01a96605a6de1f4ea4cabd" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/ExtServices" path="packages/modules/ExtServices" revision="c2bf02c01f3d40f79e35f9bc1002609a7904e726" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/packages/modules/IPsec" path="packages/modules/IPsec" revision="b3e76d32ca2fff6f736052e6dfcfec3889836b38" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/packages/modules/IPsec" path="packages/modules/IPsec" revision="2919154036bde631b05270575c83a8fbfc287f43" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/packages/modules/ModuleMetadata" path="packages/modules/ModuleMetadata" revision="bf198f3182e53f3d1dc9d061f558656e59f5d4c8" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/NetworkPermissionConfig" path="packages/modules/NetworkPermissionConfig" revision="9c39ee4eb39d65da76cd6a14ba7cf858a15a0c4c" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/NetworkStack" path="packages/modules/NetworkStack" revision="885aeb8913f1f5611b85293d2dc978d34684c6a9" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/RuntimeI18n" path="packages/modules/RuntimeI18n" revision="7685d927ed8a7cb6596ba115b2d53e028885a459" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/SdkExtensions" path="packages/modules/SdkExtensions" revision="911f53572a7ddad51b2a07d4a8609b3a9442bb5d" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/NetworkPermissionConfig" path="packages/modules/NetworkPermissionConfig" revision="8cfa62762bf2eab1194ba8828be46a1fbd7087f9" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/NetworkStack" path="packages/modules/NetworkStack" revision="10d27abfbbeae891974f6663f4dd7e29e314ffd1" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/RuntimeI18n" path="packages/modules/RuntimeI18n" revision="8d6fa86372699b438f66a94ec857f46c4139bbdc" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/SdkExtensions" path="packages/modules/SdkExtensions" revision="a6caee837fb07a59121a9fe4ae5c72649daf9e42" upstream="master"/>
   <project dest-branch="master" name="platform/packages/modules/TestModule" path="packages/modules/TestModule" revision="3523a2f0f9b12d4e60374af63aae14f75a2b4c10" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/vndk" path="packages/modules/vndk" revision="d035b0fdeff269a944b40c29d16a2e3571398c3f" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/providers/BlockedNumberProvider" path="packages/providers/BlockedNumberProvider" revision="508626f60afba73c69fd63fa9ac7aeaceb3323fc" upstream="master"/>
@@ -679,36 +709,36 @@
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/CalendarProvider" path="packages/providers/CalendarProvider" revision="e3d8716228790ebcb8af94bb766bd2d57739d2dc" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/providers/CallLogProvider" path="packages/providers/CallLogProvider" revision="54431b0dc01c67c0d59b39ba278babd47aac30b9" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/ContactsProvider" path="packages/providers/ContactsProvider" revision="cc8d17fefc8516ddbef28093cac248e2e60a0f28" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/DownloadProvider" path="packages/providers/DownloadProvider" revision="98d20cec0945d1d59c19130602db90bfd367f4ce" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/DownloadProvider" path="packages/providers/DownloadProvider" revision="0f71dcac864d807b89630a30726cf0396b2859ba" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/MediaProvider" path="packages/providers/MediaProvider" revision="735b89804878af5dae31d6884b0818bdfb271d0c" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/providers/PartnerBookmarksProvider" path="packages/providers/PartnerBookmarksProvider" revision="9c3b541b4357011de2047a2e24f92a63c6d8d8a0" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/TelephonyProvider" path="packages/providers/TelephonyProvider" revision="f27e185bce1bb0fe91fac8a487211c5022381489" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/TelephonyProvider" path="packages/providers/TelephonyProvider" revision="db19bb5be90edfe2aedccc605c82401a46a40b31" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/providers/TvProvider" path="packages/providers/TvProvider" revision="72c3c50bc143d011bdf1985a127154026b79511c" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" revision="8463287886e3dfc618eb09da758fe571c4bdc953" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/screensavers/Basic" path="packages/screensavers/Basic" revision="c8c79a5cc2d34ffc8f1caaee96f2acf26990f3ff" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/screensavers/PhotoTable" path="packages/screensavers/PhotoTable" revision="d88967f46294b1325da10075ab88cb21b812a2d1" upstream="master"/>
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/AlternativeNetworkAccess" path="packages/services/AlternativeNetworkAccess" revision="d5997fad372e6b9989f816fed1519d45ed32a249" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/BuiltInPrintService" path="packages/services/BuiltInPrintService" revision="79b3a31127cd5718507f491acd9d4d0fddd66a6e" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Car" path="packages/services/Car" revision="b5aee251b4d94f683bba85fa5b6c84ac6bc65f04" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Mms" path="packages/services/Mms" revision="67bc2e703c45f02b5436117a774c2718901070ca" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telecomm" path="packages/services/Telecomm" revision="ce5d5035c1bd5137774629b26aa8b77f8c1e77ec" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telephony" path="packages/services/Telephony" revision="cf8335c3939a06d210b0f82d86600a1356992b14" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/BuiltInPrintService" path="packages/services/BuiltInPrintService" revision="c4037b2aa4dedc03622713496a28ef83fbe51655" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Car" path="packages/services/Car" revision="a3f7a56d18bed201bee5238a5f23846b005bba71" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Mms" path="packages/services/Mms" revision="ab712c6fde98c0f36f421e272f196d7a30a59b7d" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telecomm" path="packages/services/Telecomm" revision="68518e59947b8b70b8ef235cba8fd0f6a6aad1f0" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telephony" path="packages/services/Telephony" revision="d15d4e41a8b8cd6d5f1c0abf20b4c8479a1447a3" upstream="master"/>
   <project dest-branch="master" groups="pdk-fs" name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" revision="2c4affb0eba4131177de2de0650a74d3e6aa4a2b" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/pdk" path="pdk" revision="59deedc9c468ce8ae0f10e9c30742fd6f3ac82b7" upstream="master"/>
-  <project dest-branch="master" groups="pdk-fs,pdk-cw-fs,cts" name="platform/platform_testing" path="platform_testing" revision="cecd59f47b1ce7e527d9acbc8d845cc0b3c374e5" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk-fs" name="platform/prebuilts/abi-dumps/ndk" path="prebuilts/abi-dumps/ndk" revision="f6537f21e7a5c9e1f379bfb7bcba560c021dedb9" upstream="master"/>
+  <project dest-branch="master" groups="pdk-fs,pdk-cw-fs,cts" name="platform/platform_testing" path="platform_testing" revision="86753ee38edc57dcf2eb621b472bd331d6162f80" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk-fs" name="platform/prebuilts/abi-dumps/ndk" path="prebuilts/abi-dumps/ndk" revision="5b84cd00adaf8366cc20bb97a2feef63433e3bfd" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk-fs" name="platform/prebuilts/abi-dumps/platform" path="prebuilts/abi-dumps/platform" revision="3a423764c3627dc79985b47111de8f77c7ce0aad" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk-fs" name="platform/prebuilts/abi-dumps/vndk" path="prebuilts/abi-dumps/vndk" revision="be13f0398e1ead68e288502d86fb078cf999b688" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk-fs" name="platform/prebuilts/android-emulator" path="prebuilts/android-emulator" revision="4be49d0c5b2887a1ea65a90a5615684a38b3d3e0" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/asuite" path="prebuilts/asuite" revision="244d5551901029639112c41ae69448480472c650" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="b6c1d1c0048349c2404bf731b74c27c75d3c2b9d" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk-fs" name="platform/prebuilts/android-emulator" path="prebuilts/android-emulator" revision="fea18b6695bad591306822d6b031f7ffed3fe932" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/asuite" path="prebuilts/asuite" revision="f2e114011cbdbba34b11800600ffbcb3bb33e556" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="dadcd34e041d578f03cc95606d659fd2b7d06024" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/bundletool" path="prebuilts/bundletool" revision="c6cc587801a6c70796809842c1970a374fc22883" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/checkcolor" path="prebuilts/checkcolor" revision="8740e7ad190a24e7692d6aae424e81c85a7292bc" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/checkstyle" path="prebuilts/checkstyle" revision="9bb3ec57ad252a8f73683fc37d1d4e5347fd355d" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" revision="441f03682caa769215949156a2b58d7b1806a816" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk,darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="d53798cd9b93067abe95db6f82a0fc28df0a5e3a" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="0ec7b7087c2eb9a8429f2fb4c2ed121c18132657" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk-fs" name="platform/prebuilts/cmdline-tools" path="prebuilts/cmdline-tools" revision="1fd33729ab2f6214d038ec136fd1cc2234085c64" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/checkstyle" path="prebuilts/checkstyle" revision="f3179e75784f9551d648e9035944b36569e017a9" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" revision="ec7e496bac97241dc9c26d44ca71df66e2b26f20" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk,darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="b40fb300258802b9a6c56ce0d33ca8dfd3e665b1" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="8539e6c8e61390f065090d1a1c04ec95107c8621" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk-fs" name="platform/prebuilts/cmdline-tools" path="prebuilts/cmdline-tools" revision="1b7d724e36df1caab8b6bebbdd0b379eef8d6f69" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk-fs" name="platform/prebuilts/devtools" path="prebuilts/devtools" revision="bc11a72a91685bb0a35e7ecf10ffcba4e07558bd" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk-fs" name="platform/prebuilts/fuchsia_sdk" path="prebuilts/fuchsia_sdk" revision="12c41f24a38aefda3c5dda0dd513945b616cd765" upstream="master"/>
   <project clone-depth="1" dest-branch="master" 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="e3c9192408e0ad4fa1a7b39f111dac93aef4dca8" upstream="master"/>
@@ -719,14 +749,14 @@
   <project clone-depth="1" dest-branch="master" 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="6db7620069bbcac51474f5e4b0691071273f589a" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk,linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="1d67e7fe709e8f81e91e5f85a5d4c04b27c6b319" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk,linux" 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="90e45fec56fdeac84c9eb174c63fa6e748c6faa9" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk-fs" 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="4efc2a937f271a766ad1c11eb930d6e150ecb694" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk-fs" 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="c4602d47837e2518310d06c26952d23a45ce4ab9" upstream="master"/>
   <project clone-depth="1" dest-branch="master" 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="2bf8cb6fba61df1d2725364d1751622979b085e3" upstream="master"/>
   <project clone-depth="1" dest-branch="master" 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="6d6c9c7e26cf86eafd41b9e73840c7f8d50d1027" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="darwin,pdk" name="platform/prebuilts/gdb/darwin-x86" path="prebuilts/gdb/darwin-x86" revision="284b55fac5598bcd1f986e69b7556befdd663c53" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="linux,pdk" name="platform/prebuilts/gdb/linux-x86" path="prebuilts/gdb/linux-x86" revision="9453bfa625bc14025e6aa50dc296dd82ebbfb8c6" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="darwin,pdk,tradefed" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="3d0e53b900fd8e721733b7d54a1acef694a47333" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="linux,pdk,tradefed" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="3affa1d2632b48f9589ab4c91ca1b825d7c73a87" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/gradle-plugin" path="prebuilts/gradle-plugin" revision="68f2332cdaab47ad03b3d57be0e83c6cec3d4463" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="darwin,pdk,tradefed" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="4fc930dc420b9dc5034415f50726b938d32ac5fe" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="linux,pdk,tradefed" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="1cc20d34d0e35a919285741c1c907a10bb78a798" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/gradle-plugin" path="prebuilts/gradle-plugin" revision="69b1878569e5c592e009808ae7fa6e303db2c78e" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/jdk/jdk11" path="prebuilts/jdk/jdk11" revision="e4fb089b45a6633baf0233e2c524d614ed7355f1" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="74e4f1844dfa9b8df9e0fe2ff34a2ecc24d52b07" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="3447ef32fa4961229942fa345c8707c7f9e00246" upstream="master"/>
@@ -734,17 +764,17 @@
   <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/manifest-merger" path="prebuilts/manifest-merger" revision="c61778dd7fdef4194cf8592f9d4a7ead9bb16811" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/maven_repo/android" path="prebuilts/maven_repo/android" revision="ecc2406087855bedf2d8e8e528ab0b2b4e6c7298" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/maven_repo/bumptech" path="prebuilts/maven_repo/bumptech" revision="52359d0baa6af2c033f5ee57c8fbb3f51deb734e" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/misc" path="prebuilts/misc" revision="cd9a0395ecbd7a288389659825b887337e011fad" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/misc" path="prebuilts/misc" revision="8430fec9bf77c601284583665d9fae3d514cf0b4" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/module_sdk/art" path="prebuilts/module_sdk/art" revision="0a68152386e56eab7fce3813aca01301e197b17b" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/ndk" path="prebuilts/ndk" revision="f5538578aa305b4764283b729b10b3c31a15a558" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="darwin,pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/python/darwin-x86/2.7.5" path="prebuilts/python/darwin-x86/2.7.5" revision="0c5958b1636c47ed7c284f859c8e805fd06a0e63" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="linux,pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/python/linux-x86/2.7.5" path="prebuilts/python/linux-x86/2.7.5" revision="53add29eb7b4eaa9e128e3ec84eac9e65cf4c986" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/qemu-kernel" path="prebuilts/qemu-kernel" revision="cd1c5445af154697bb10225d7fed1e3cfb675d2a" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/r8" path="prebuilts/r8" revision="3f080c30a919540200726608f4f99ebbad1be01c" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/remoteexecution-client" path="prebuilts/remoteexecution-client" revision="de1619964332c69714a989a14d9ca7b16ed6c4fc" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/rust" path="prebuilts/rust" revision="0dd58bb4b71dee4506e00fd1b42442652c03a055" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="eaedd72dd55cd357da6ab544af30926a01384539" upstream="master"/>
-  <project clone-depth="1" dest-branch="master" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" revision="ef25140553d3c1a73c716896a80c2bec40b0758c" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/qemu-kernel" path="prebuilts/qemu-kernel" revision="19b60d18119b92db7ba784573badd6e26c333e03" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/r8" path="prebuilts/r8" revision="3ebd66e92a1986e1a018f28c2bbdf8b4705dd076" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/remoteexecution-client" path="prebuilts/remoteexecution-client" revision="2c905992ecdcd6c44357cf326e96dc9afc154bd8" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/rust" path="prebuilts/rust" revision="765d27cdd93fb86280c2c8e5a85fde72073a6c8f" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/sdk" path="prebuilts/sdk" revision="c0f0e221d2d4a0e0b383d576a3d4c2002234b3f2" upstream="master"/>
+  <project clone-depth="1" dest-branch="master" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" revision="f5463ac0726032c647ec02f6e66a36625142d18d" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/vndk/v27" path="prebuilts/vndk/v27" revision="0f6002bffc84a181b476f07f1d1491aacffa8924" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/vndk/v28" path="prebuilts/vndk/v28" revision="2569adfe06033d1758f37e33b5b50e57e2aabd44" upstream="master"/>
   <project clone-depth="1" dest-branch="master" groups="pdk" name="platform/prebuilts/vndk/v29" path="prebuilts/vndk/v29" revision="da70d9a2d97c65571f1fa353c221afdef2da081a" upstream="master"/>
@@ -752,97 +782,98 @@
   <project dest-branch="master" groups="pdk-cw-fs,pdk-fs" name="platform/sdk" path="sdk" revision="7cb6fc634a03afec776a03f2543185908b3563b0" upstream="master">
     <linkfile dest="frameworks/support/README.md" src="current/androidx-README.md"/>
   </project>
-  <project dest-branch="master" groups="pdk" name="platform/system/apex" path="system/apex" revision="0e79ad5ca748e9c45af927059b19efd5c818ecb1" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/bpf" path="system/bpf" revision="89515d979aa817546d5050027300a177b033002d" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/apex" path="system/apex" revision="f840a81213926bd091cd0afbae125a347fe7ccea" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/bpf" path="system/bpf" revision="21f34cb32c0f2a3bafd66ef97919989c780ce31c" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/system/bpfprogs" path="system/bpfprogs" revision="beed480907f887e655f4c4ba52f30e688c54eae3" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/bt" path="system/bt" revision="716c17b6d239a8fb6c1e7864e8cef16288ca23af" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/bt" path="system/bt" revision="270ce5131651b39357dd8aafced60d91fe89d9f7" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/system/ca-certificates" path="system/ca-certificates" revision="1bfb2b42158b24a1d30fc2fab0728e74c03aa332" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/chre" path="system/chre" revision="677bde61d6fb47492187b82fd7da119fc083e206" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/chre" path="system/chre" revision="078afe6d04d9afc83d0e9608d28136a0fb69719e" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/system/connectivity/wificond" path="system/connectivity/wificond" revision="0bcc0e4488989dad285c7664b4cdaa6eaad666d4" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/system/connectivity/wifilogd" path="system/connectivity/wifilogd" revision="6b125d3435b4e931934306a866bb591bb67dce14" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/core" path="system/core" revision="cf88259783b103ef514c0fe4eedafeea3733d140" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/extras" path="system/extras" revision="edaa73fdfc0df50a24266c6d0904986ae23d5635" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/gatekeeper" path="system/gatekeeper" revision="e583844fc9c6d6dbb293f8694fd66cd5a4794c02" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/gsid" path="system/gsid" revision="7247c8258aa33f412708d65d3d5ad329d71dcf79" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/hardware/interfaces" path="system/hardware/interfaces" revision="bddb0119cbd06743e6ee9fceef469d157b581b48" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/hwservicemanager" path="system/hwservicemanager" revision="54527cca4e9c2e8fced9d5f7a1bfaa5b3998eaff" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/incremental_delivery" path="system/incremental_delivery" revision="1d78fd0d97fe2a165a75d2f2f5f070f32a5ed5e0" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/core" path="system/core" revision="52c8422ea19b5719f8128b85fb01d985bd415c46" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/extras" path="system/extras" revision="131bc0ee8916b1fa1b31ac240c320483c82cea5b" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/gatekeeper" path="system/gatekeeper" revision="644ddd6370eb6a943d56c8021ed98cc72599d50e" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/gsid" path="system/gsid" revision="60bbc030e129d8e160044bebfd2f8c04abe0ffd9" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/hardware/interfaces" path="system/hardware/interfaces" revision="303520bd3f4f16c3dcc180851622f8cb3b84d2e0" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/hwservicemanager" path="system/hwservicemanager" revision="5531f87ad32eaeca3659a8d2624733df0ca119d2" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/incremental_delivery" path="system/incremental_delivery" revision="629be47a284536e9b5529be1cf9c51e1f87ec6a5" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/system/iorap" path="system/iorap" revision="806a07b868ac808bbd7ef09c37d6bd180e15de36" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/keymaster" path="system/keymaster" revision="032480f59d927c072027ad8a9e4f033e63a33f1b" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/libartpalette" path="system/libartpalette" revision="2848934f836db8cccc8b1ec3040f5d7248d4f6c5" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/libbase" path="system/libbase" revision="3976d637ee882c993c16359fa3f80fd7e051453c" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/libfmq" path="system/libfmq" revision="ba902deb92f750f4449332379ce5cde94fbba44c" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/libhidl" path="system/libhidl" revision="1a60691cf7fcfd9227881294e7d9c149dda0642c" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/libhwbinder" path="system/libhwbinder" revision="28b75b23474b35fc4bf64c6aa0260684be80ddc3" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/libsysprop" path="system/libsysprop" revision="81e06ccbe58bd6221615c2ffc752f1b8dc3fae51" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/libufdt" path="system/libufdt" revision="9ac361251b4ed3b891b479045f5c96edc2c83d74" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/libvintf" path="system/libvintf" revision="593a76995ae1c93173228540248953a604802291" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/libziparchive" path="system/libziparchive" revision="7679e7393598c358b0abf605624c2e0dcd577ce0" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/linkerconfig" path="system/linkerconfig" revision="2539447e8f335e8b0eb82d43036b3eb340ac7d18" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/media" path="system/media" revision="03cc3d44a53c7daab1d3aa3da4e2d8d7bb81d7a3" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/memory/libdmabufheap" path="system/memory/libdmabufheap" revision="4632599bc1524a08cc2d947e205107b9da1bf086" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/keymaster" path="system/keymaster" revision="e2900afdbb64f00dc72050c6862147479ececed2" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/libartpalette" path="system/libartpalette" revision="6079ce8956a9e5716fcee559ab7c27f5f044386c" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/libbase" path="system/libbase" revision="78f1c2f83e625bdf66d55b48bdb3a301c20d2fb3" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/libfmq" path="system/libfmq" revision="0b86c494d121cae76ae2336e3ade962d0df7222c" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/libhidl" path="system/libhidl" revision="f38e3d71c376540a4099cad62c8b95c8e0976752" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/libhwbinder" path="system/libhwbinder" revision="6c4ba9650cef32dbbd7a6651c0826ca2ac4accd1" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/libsysprop" path="system/libsysprop" revision="0078f565a09d910e9b186428f6d343180d757b44" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/libufdt" path="system/libufdt" revision="727ccceadfaa49816a9ccf07762232fa09a54bef" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/libvintf" path="system/libvintf" revision="6c6eebf2acdae2b2f87c63e73848d6e73f7b08b9" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/libziparchive" path="system/libziparchive" revision="27d0eaa4ea9e6cfd7b9cf14ebc3fc5e6162a88f5" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/linkerconfig" path="system/linkerconfig" revision="0bb103f96df9d3fcbfdfdc1f06d344e1fc3c2ac3" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/media" path="system/media" revision="ed6d0e7c48c1dfe9bb7f5cf85f75e545284e2783" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/memory/libdmabufheap" path="system/memory/libdmabufheap" revision="2bc3e2c39d2b5297119bf8e7aa2b6494771f0e74" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/system/memory/libion" path="system/memory/libion" revision="fff944ed86fd8ab67cd3e961368522b1132d43a3" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/memory/libmeminfo" path="system/memory/libmeminfo" revision="22af8e3d4d06a880d466dc093c3cc1427ca198bd" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/memory/libmeminfo" path="system/memory/libmeminfo" revision="8bee3d91dc26ab34a17269b8ad7f11769d2e935f" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/system/memory/libmemtrack" path="system/memory/libmemtrack" revision="800d172aabf2be6b83939a41f996c070b22cc05d" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/system/memory/libmemunreachable" path="system/memory/libmemunreachable" revision="fe4c42218a61f3d54bb47810fb66f23e54e64cec" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/memory/lmkd" path="system/memory/lmkd" revision="ff6ad5cd065a0139e820df8a07feaa146b9fcdf8" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/netd" path="system/netd" revision="4a0d693ea481a06e6fae668ba1d01d9eeb812404" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/memory/lmkd" path="system/memory/lmkd" revision="d7b4fcb8a538abaedad194033da61f4f94a6d97a" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/netd" path="system/netd" revision="4d1c6b220989b85ae864ef04d94b49a44e2c71a6" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/system/nfc" path="system/nfc" revision="5d6cf5d30f58fcad9ad9413afb3046f64a045386" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/system/nvram" path="system/nvram" revision="184c1c9a5c39f51f82bdb453afc9cf144f8e4183" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/security" path="system/security" revision="e3421680c88cb9af44e4f63e1230069301ff3ad9" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/sepolicy" path="system/sepolicy" revision="03c94a8cc34b0f7fceb5099c4aa5b632d8a58d85" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/security" path="system/security" revision="dc246a01c1f0b4bfcda2d263e127be42968814c6" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/sepolicy" path="system/sepolicy" revision="cc782e451667a93bc55e15bb5766608f7792b39e" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/system/server_configurable_flags" path="system/server_configurable_flags" revision="dc7438f938a08470f961ba04bb8767b4d44199cd" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/system/teeui" path="system/teeui" revision="aa62b6cb40f57cf9548099db1c91c8a452c100a6" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/testing/gtest_extras" path="system/testing/gtest_extras" revision="06241cdfbd72d9b9516e2d20cd3cd5a3ab5cb8de" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/timezone" path="system/timezone" revision="3472311082d0c015cf803b3284f8d9c337ccaeda" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/tools/aidl" path="system/tools/aidl" revision="c2a438f9b00dee97244d99da5c48d90c238361b2" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/tools/hidl" path="system/tools/hidl" revision="143f0592035e80dd8ce73e8cc312f9176888c4e2" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/testing/gtest_extras" path="system/testing/gtest_extras" revision="8b01e5b60bb320cc0f81da43f31bd6a73ecc7860" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/timezone" path="system/timezone" revision="0a4103ef371c813d4c33fd7ef85086b99594ad97" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/tools/aidl" path="system/tools/aidl" revision="db7ac514fd031b99944b9e4f4b3f3aed9c430476" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/tools/hidl" path="system/tools/hidl" revision="103d628819e23bb63f9b6913d02da6026644f870" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/system/tools/mkbootimg" path="system/tools/mkbootimg" revision="5cc6456425d98d8fce685dcb13d3ad8baffccccf" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/tools/sysprop" path="system/tools/sysprop" revision="2833e7f2a24747ec9caa3414b8488de8fceefa88" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/tools/xsdc" path="system/tools/xsdc" revision="45d0afc106303174a9a9a8ab5980440477d87c62" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/update_engine" path="system/update_engine" revision="99d570d67bd5dab11de321068c4002ab76ae774a" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/system/vold" path="system/vold" revision="d49f8c9eb7e71cfeca5d5b85016ea8113f376148" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/tools/sysprop" path="system/tools/sysprop" revision="1d166c2f4d45a1c2eb6064b6c2f5bd5559a7d889" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/tools/xsdc" path="system/tools/xsdc" revision="91af95ccdcd4cd7da06471c84c661dc582b190b4" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/update_engine" path="system/update_engine" revision="5d7a1de410f98011b18306c679eec2cf29cda85f" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/system/vold" path="system/vold" revision="5de675c93be181256ecc0361e885fa922693cfb8" upstream="master"/>
   <project dest-branch="master" name="platform/test/app_compat/csuite" path="test/app_compat/csuite" revision="a82698d20c210475ffbb9add00cc8502dc012abc" upstream="master"/>
-  <project dest-branch="master" groups="vts,projectarch,pdk" name="platform/test/framework" path="test/framework" revision="98027f894c75fcd9d45dd9973f01433d35d67705" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/test/mlts/benchmark" path="test/mlts/benchmark" revision="58be94813a5737233681a69ba035ce70cffe1b10" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/test/mlts/models" path="test/mlts/models" revision="a92852efb52754926c69e9cdbe651de935f55349" upstream="master"/>
+  <project dest-branch="master" groups="vts,projectarch,pdk" name="platform/test/framework" path="test/framework" revision="0690d5b557c21763d28905a74dda85a41a3f65d7" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/test/mlts/benchmark" path="test/mlts/benchmark" revision="d8df104d8497f42c2a8fff0402b082f28bd902b3" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/test/mlts/models" path="test/mlts/models" revision="73313692ee90e6d768cd086fbb7c94298ecaf1ac" upstream="master"/>
   <project dest-branch="master" name="platform/test/mts" path="test/mts" revision="c6ba595da2de2eb1ec577842cbf33df1e83c4c11" upstream="master"/>
-  <project dest-branch="master" groups="cts,pdk-cw-fs,pdk-fs" name="platform/test/suite_harness" path="test/suite_harness" revision="1f39d6aa0f41dc429eddeaf4571e3bcdb83f749c" upstream="master"/>
+  <project dest-branch="master" groups="cts,pdk-cw-fs,pdk-fs" name="platform/test/suite_harness" path="test/suite_harness" revision="2846fc39a7f5374a37406ee323c997e05b250373" upstream="master"/>
   <project dest-branch="master" groups="vts,projectarch,pdk" name="platform/test/vti/dashboard" path="test/vti/dashboard" revision="a9bd47e4caa21d535fb89c0e6efe23fa08d25847" upstream="master"/>
   <project dest-branch="master" groups="vts,projectarch,pdk" name="platform/test/vti/fuzz_test_serving" path="test/vti/fuzz_test_serving" revision="6319e3d94c65669050c49c6ca570096d41823b82" upstream="master"/>
   <project dest-branch="master" groups="vts,projectarch,pdk" name="platform/test/vti/test_serving" path="test/vti/test_serving" revision="3da55c2868ace67e4841506c3f20caf5b9dd27cb" upstream="master"/>
-  <project dest-branch="master" groups="vts,pdk" name="platform/test/vts" path="test/vts" revision="7da8e63f7f304999dcf634f0ac5bd6f41c3b9351" upstream="master"/>
+  <project dest-branch="master" groups="vts,pdk" name="platform/test/vts" path="test/vts" revision="4c6cd427ad8bb72b59856a381f10b2c608eeb21a" upstream="master"/>
   <project dest-branch="master" groups="vts,projectarch,pdk" name="platform/test/vts-testcase/fuzz" path="test/vts-testcase/fuzz" revision="b740c5e12e313e90f5d6754d04c72f19503aea57" upstream="master"/>
-  <project dest-branch="master" groups="vts,pdk" name="platform/test/vts-testcase/hal" path="test/vts-testcase/hal" revision="dda3c06965f752c60f8cf0dfbf785cf722dccc19" upstream="master"/>
+  <project dest-branch="master" groups="vts,pdk" name="platform/test/vts-testcase/hal" path="test/vts-testcase/hal" revision="6a687ba500a88d33cf32e739a2fbf75720204fc9" upstream="master"/>
   <project dest-branch="master" groups="vts,pdk" name="platform/test/vts-testcase/hal-trace" path="test/vts-testcase/hal-trace" revision="2695892568f8fade958ec0ec172df8f295ae4112" upstream="master"/>
-  <project dest-branch="master" groups="vts,pdk" name="platform/test/vts-testcase/kernel" path="test/vts-testcase/kernel" revision="69a220493fc86d88a8f7187b7f913c7b7901051f" upstream="master"/>
+  <project dest-branch="master" groups="vts,pdk" name="platform/test/vts-testcase/kernel" path="test/vts-testcase/kernel" revision="e9ff045753bd0d16148d3b73e475cfc03df64b4d" upstream="master"/>
   <project dest-branch="master" groups="vts,projectarch,pdk" name="platform/test/vts-testcase/nbu" path="test/vts-testcase/nbu" revision="0712e2a442364af77a0b1dda0adf922d1d1447bc" upstream="master"/>
   <project dest-branch="master" groups="vts,projectarch,pdk" name="platform/test/vts-testcase/performance" path="test/vts-testcase/performance" revision="f0e5dcee43de6f9c44a3872721087d96eaa48273" upstream="master"/>
-  <project dest-branch="master" groups="vts,projectarch,pdk" name="platform/test/vts-testcase/security" path="test/vts-testcase/security" revision="fffb501fb705c5b35e1fab47d0eb5f607e7ba58d" upstream="master"/>
-  <project dest-branch="master" groups="vts,pdk" name="platform/test/vts-testcase/vndk" path="test/vts-testcase/vndk" revision="9a9537112ba71c5412b14d0d05c32feff67f65bd" upstream="master"/>
-  <project dest-branch="master" groups="tools,vts,projectarch,pdk,tradefed" name="platform/tools/acloud" path="tools/acloud" revision="7faf3b563821d5158a512a7fc7c694ad0d0e7c42" upstream="master"/>
-  <project dest-branch="master" groups="pdk,tools" name="platform/tools/apifinder" path="tools/apifinder" revision="05eee3720e682f4ce5ce1153f0236cee12d3883a" upstream="master"/>
-  <project dest-branch="master" groups="pdk,tradefed" name="platform/tools/apksig" path="tools/apksig" revision="2dd388f2f5595d93199ed322ff55c48233d89e99" upstream="master"/>
+  <project dest-branch="master" groups="vts,projectarch,pdk" name="platform/test/vts-testcase/security" path="test/vts-testcase/security" revision="50d45dc890d2ce5ad35527c0e3f3d82e7edbbe1f" upstream="master"/>
+  <project dest-branch="master" groups="vts,pdk" name="platform/test/vts-testcase/vndk" path="test/vts-testcase/vndk" revision="d1cf5ee0d7b873d80e70d6abce05354058062002" upstream="master"/>
+  <project dest-branch="master" groups="tools,vts,projectarch,pdk,tradefed" name="platform/tools/acloud" path="tools/acloud" revision="e86746c259190406bc489d9215e7bb44ddb897bb" upstream="master"/>
+  <project dest-branch="master" groups="pdk,tools" name="platform/tools/apifinder" path="tools/apifinder" revision="84052f24c4260257c01e298a454cb044a5c01242" upstream="master"/>
+  <project dest-branch="master" groups="pdk,tradefed" name="platform/tools/apksig" path="tools/apksig" revision="e8db2a0b55e78efc3848fc575add5dfbe778b04d" upstream="master"/>
   <project dest-branch="master" groups="pdk,tradefed" name="platform/tools/apkzlib" path="tools/apkzlib" revision="eba4cc5b98798e46c3f80b9dd0bdbd92757e4dde" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/tools/asuite" path="tools/asuite" revision="09bbdab5ac77be465d7c49c2ad197ff09c6a8387" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/tools/asuite" path="tools/asuite" revision="2445f9a0adfe34c9a24119b338a6c97c66ecf1d9" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/tools/currysrc" path="tools/currysrc" revision="7074dfcc06d5e89a0980885c6955124edbb946fc" upstream="master"/>
-  <project dest-branch="master" groups="tools,pdk-fs" name="platform/tools/dexter" path="tools/dexter" revision="29183339b36620dae3cca0d6c5632f00ad75dee3" upstream="master"/>
+  <project dest-branch="master" groups="tools,pdk-fs" name="platform/tools/dexter" path="tools/dexter" revision="298a27ed8a7de2c91e30d1b343713c0490fdc503" upstream="master"/>
   <project dest-branch="master" groups="tools" name="platform/tools/doc_generation" path="tools/doc_generation" revision="e7c9b74790a10ef58f165b32d0755831a8d93e32" upstream="master"/>
   <project dest-branch="master" groups="tools" name="platform/tools/external/fat32lib" path="tools/external/fat32lib" revision="68194a031e8f0a8f4ab68184aeb7ee9d9b86ceca" upstream="master"/>
-  <project dest-branch="master" groups="tools" name="platform/tools/external_updater" path="tools/external_updater" revision="7b02ba8a374bf7ad4f89671cbeb0027dd4706603" upstream="master"/>
-  <project dest-branch="master" groups="nopresubmit,pdk,tradefed" name="platform/tools/loganalysis" path="tools/loganalysis" revision="77e029a6d9f4c32190d04c9f95b5fe0abe1908ba" upstream="master"/>
-  <project dest-branch="master" groups="pdk,tools" name="platform/tools/metalava" path="tools/metalava" revision="2528b523056e99edbb8d87cec7173b4124f60780" upstream="master"/>
-  <project dest-branch="master" groups="adt-infra,cts,developers,motodev,pdk,tools,tradefed" name="platform/tools/repohooks" path="tools/repohooks" revision="bf70aed7478925fb510a3622e16195d699223e4c" upstream="master"/>
-  <project dest-branch="master" groups="pdk,tools" name="platform/tools/security" path="tools/security" revision="8fda2188a1f64f61252eef302523fe9f062db36b" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="platform/tools/test/connectivity" path="tools/test/connectivity" revision="b6b1cea2cfae4da2560c516be2cddfbcbd8cbc77" upstream="master"/>
+  <project dest-branch="master" groups="tools" name="platform/tools/external_updater" path="tools/external_updater" revision="e8c98de52551020ad857b106d45f026ee607d6f4" upstream="master"/>
+  <project dest-branch="master" groups="nopresubmit,pdk,tradefed" name="platform/tools/loganalysis" path="tools/loganalysis" revision="24fc3e04ee73c2f64c588ffb37f6d603d1e77231" upstream="master"/>
+  <project dest-branch="master" groups="pdk,tools" name="platform/tools/metalava" path="tools/metalava" revision="1c8c0af98fecd1e02f1f55c5d97e2fe3a7699948" upstream="master"/>
+  <project dest-branch="master" groups="adt-infra,cts,developers,motodev,pdk,tools,tradefed" name="platform/tools/repohooks" path="tools/repohooks" revision="7e07d8f6fd7a290a9fce80bb403efdf2d6ab592d" upstream="master"/>
+  <project dest-branch="master" groups="pdk,tools" name="platform/tools/security" path="tools/security" revision="5de12c62271730443c0762a13c0b6d229435261e" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="platform/tools/test/connectivity" path="tools/test/connectivity" revision="c20fb04f3f192381b536aed443aaa9af262c58b8" upstream="master"/>
   <project dest-branch="master" groups="pdk" name="platform/tools/test/graphicsbenchmark" path="tools/test/graphicsbenchmark" revision="9eb54ab3f7f35d1696ca650d02a0657620d25f09" upstream="master"/>
-  <project dest-branch="master" groups="pdk,tradefed" name="platform/tools/tradefederation" path="tools/tradefederation/core" revision="02efff3f5cd67b871c8642e6db6c63549cd78e2a" upstream="master"/>
-  <project dest-branch="master" groups="pdk,tradefed" name="platform/tools/tradefederation/contrib" path="tools/tradefederation/contrib" revision="7eaeb6b981685b77df5bf7b22a05ce7a11d17b0d" upstream="master"/>
-  <project dest-branch="master" groups="tools,pdk" name="platform/tools/treble" path="tools/treble" revision="6b8d3d876628ecaa39a433987f3b780f999f54aa" upstream="master"/>
+  <project dest-branch="master" groups="tools" name="platform/tools/test/openhst" path="tools/test/openhst" revision="da7edd0aa694c175a34f9dc507cad301610bfc3f" upstream="master"/>
+  <project dest-branch="master" groups="pdk,tradefed" name="platform/tools/tradefederation" path="tools/tradefederation/core" revision="c3ea459b3262d08dfcec460cc58541e493ada9bf" upstream="master"/>
+  <project dest-branch="master" groups="pdk,tradefed" name="platform/tools/tradefederation/contrib" path="tools/tradefederation/contrib" revision="33061ed643eb6cdc205a1676849dc4aeae0b8efa" upstream="master"/>
+  <project dest-branch="master" groups="tools,pdk" name="platform/tools/treble" path="tools/treble" revision="77a15cc7664628ff7ad00c35dfb8c1829ed5ffe0" upstream="master"/>
   <project dest-branch="master" groups="tools,cts,pdk,pdk-cw-fs,pdk-fs" name="platform/tools/trebuchet" path="tools/trebuchet" revision="d2240446bb55e53591d85fe1b9a795aca10a92be" upstream="master"/>
-  <project dest-branch="master" name="toolchain/benchmark" revision="f0080c2949dd06f1c565738e06b3bbd2c100de3b" upstream="master"/>
-  <project dest-branch="master" groups="pdk" name="toolchain/pgo-profiles" revision="fe693664432ce8cee531d788fef400c00f99b687" upstream="master"/>
-  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs,pdk" name="tools/platform-compat" revision="c81c17a952c42e8d3db7a6b469d1e783bf0e2a96" upstream="master"/>
+  <project dest-branch="master" name="toolchain/benchmark" revision="b8f114fae8201769bc8c13424e2a59ff93e109f4" upstream="master"/>
+  <project dest-branch="master" groups="pdk" name="toolchain/pgo-profiles" revision="e0d6d44cd78bce117dab8362f6f6d4f5da5d74cc" upstream="master"/>
+  <project dest-branch="master" groups="pdk-cw-fs,pdk-fs,pdk" name="tools/platform-compat" revision="2fbdb23e180f36de523066beaf3a20a1efc5389b" upstream="master"/>
   
   <repo-hooks enabled-list="pre-upload" in-project="platform/tools/repohooks"/>
 </manifest>