Manifest for Android CTS 9.0 Release 3 (5016358)

Change-Id: Iba778c8055057b62545e57f0791693c309f9fc30

default.xml

@@ -2,7 +2,7 @@
 <manifest>
 
   <remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
-  <default remote="aosp" revision="refs/tags/android-cts-10.0_r2" sync-j="4" />
+  <default remote="aosp" revision="refs/tags/android-cts-9.0_r3" sync-j="4" />
 
   <project groups="pdk" name="platform/build" path="build/make">
     <copyfile dest="Makefile" src="core/root.mk" />
@@ -22,14 +22,13 @@
   <project groups="pdk" name="platform/art" path="art" />
   <project groups="pdk" name="platform/bionic" path="bionic" />
   <project groups="pdk" name="platform/bootable/recovery" path="bootable/recovery" />
+  <project groups="pdk" name="platform/compatibility/cdd" path="compatibility/cdd" />
   <project groups="cts,pdk-cw-fs,pdk-fs" name="platform/cts" path="cts" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/dalvik" path="dalvik" />
-  <project groups="developers,pdk" name="platform/developers/build" path="developers/build" />
+  <project groups="developers" name="platform/developers/build" path="developers/build" />
   <project groups="developers" name="platform/developers/demos" path="developers/demos" />
   <project groups="developers" name="platform/developers/samples/android" path="developers/samples/android" />
   <project groups="developers,pdk-cw-fs,pdk-fs" name="platform/development" path="development" />
-  <project groups="device,yukawa,pdk" name="device/amlogic/yukawa" path="device/amlogic/yukawa" />
-  <project clone-depth="1" groups="device,yukawa,pdk" name="device/amlogic/yukawa-kernel" path="device/amlogic/yukawa-kernel" />
   <project groups="pdk-cw-fs,pdk" name="device/common" path="device/common" />
   <project groups="pdk" name="device/generic/arm64" path="device/generic/arm64" />
   <project groups="pdk" name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" />
@@ -37,67 +36,57 @@
   <project groups="pdk" name="device/generic/common" path="device/generic/common" />
   <project groups="pdk" name="device/generic/goldfish" path="device/generic/goldfish" />
   <project groups="pdk" name="device/generic/goldfish-opengl" path="device/generic/goldfish-opengl" />
+  <project groups="pdk" name="device/generic/mips" path="device/generic/mips" />
+  <project groups="pdk" name="device/generic/mips64" path="device/generic/mips64" />
   <project groups="pdk" name="device/generic/mini-emulator-arm64" path="device/generic/mini-emulator-arm64" />
   <project groups="pdk" name="device/generic/mini-emulator-armv7-a-neon" path="device/generic/mini-emulator-armv7-a-neon" />
+  <project groups="pdk" name="device/generic/mini-emulator-mips" path="device/generic/mini-emulator-mips" />
+  <project groups="pdk" name="device/generic/mini-emulator-mips64" path="device/generic/mini-emulator-mips64" />
   <project groups="pdk" name="device/generic/mini-emulator-x86" path="device/generic/mini-emulator-x86" />
   <project groups="pdk" name="device/generic/mini-emulator-x86_64" path="device/generic/mini-emulator-x86_64" />
-  <project groups="pdk" name="device/generic/opengl-transport" path="device/generic/opengl-transport" />
   <project groups="pdk" name="device/generic/qemu" path="device/generic/qemu" />
-  <project groups="pdk" name="device/generic/trusty" path="device/generic/trusty" />
   <project groups="device,pdk" name="device/generic/uml" path="device/generic/uml" />
   <project groups="pdk" name="device/generic/x86" path="device/generic/x86" />
   <project groups="pdk" name="device/generic/x86_64" path="device/generic/x86_64" />
+  <project groups="device,pdk" name="device/google/accessory/arduino" path="device/google/accessory/arduino" />
+  <project groups="device,pdk" name="device/google/accessory/demokit" path="device/google/accessory/demokit" />
   <project groups="device,broadcom_pdk,generic_fs,pdk" name="device/google/atv" path="device/google/atv" />
-  <project groups="device,bonito" name="device/google/bonito" path="device/google/bonito" />
-  <project clone-depth="1" groups="device,bonito" name="device/google/bonito-kernel" path="device/google/bonito-kernel" />
-  <project groups="device,bonito" name="device/google/bonito-sepolicy" path="device/google/bonito-sepolicy" />
   <project groups="device,marlin,pdk" name="device/google/contexthub" path="device/google/contexthub" />
-  <project groups="device,crosshatch,generic_fs" name="device/google/crosshatch" path="device/google/crosshatch" />
-  <project clone-depth="1" groups="device,crosshatch,generic_fs" name="device/google/crosshatch-kernel" path="device/google/crosshatch-kernel" />
-  <project groups="device,crosshatch,generic_fs" name="device/google/crosshatch-sepolicy" path="device/google/crosshatch-sepolicy" />
-  <project groups="device,pdk" name="device/google/cuttlefish" path="device/google/cuttlefish" />
-  <project groups="device,pdk" name="device/google/cuttlefish_common" path="device/google/cuttlefish_common" />
-  <project clone-depth="1" groups="device,pdk" name="device/google/cuttlefish_kernel" path="device/google/cuttlefish_kernel" />
-  <project clone-depth="1" groups="device,pdk" name="device/google/cuttlefish_vmm" path="device/google/cuttlefish_vmm" />
-  <project groups="device" name="device/google/fuchsia" path="device/google/fuchsia" />
-  <project groups="device,marlin" name="device/google/marlin" path="device/google/marlin" />
-  <project clone-depth="1" groups="device,marlin" name="device/google/marlin-kernel" path="device/google/marlin-kernel" />
-  <project groups="device,generic_fs,muskie" name="device/google/muskie" path="device/google/muskie" />
-  <project groups="device,taimen" name="device/google/taimen" path="device/google/taimen" />
+  <project groups="device" name="device/google/cuttlefish" path="device/google/cuttlefish" />
+  <project groups="device" name="device/google/cuttlefish_common" path="device/google/cuttlefish_common" />
+  <project clone-depth="1" groups="device" name="device/google/cuttlefish_kernel" path="device/google/cuttlefish_kernel" />
+  <project groups="device,marlin,pdk" name="device/google/marlin" path="device/google/marlin" />
+  <project clone-depth="1" groups="device,marlin,pdk" name="device/google/marlin-kernel" path="device/google/marlin-kernel" />
+  <project groups="device,muskie,pdk" name="device/google/muskie" path="device/google/muskie" />
+  <project groups="device,taimen,pdk" name="device/google/taimen" path="device/google/taimen" />
   <project clone-depth="1" groups="pdk" name="device/google/vrservices" path="device/google/vrservices" />
-  <project groups="device,generic_fs,wahoo" name="device/google/wahoo" path="device/google/wahoo" />
-  <project clone-depth="1" groups="device,generic_fs,wahoo" name="device/google/wahoo-kernel" path="device/google/wahoo-kernel" />
+  <project groups="device,wahoo,pdk" name="device/google/wahoo" path="device/google/wahoo" />
+  <project clone-depth="1" groups="device,wahoo,pdk" name="device/google/wahoo-kernel" path="device/google/wahoo-kernel" />
   <project name="device/linaro/bootloader/arm-trusted-firmware" path="device/linaro/bootloader/arm-trusted-firmware" />
   <project name="device/linaro/bootloader/edk2" path="device/linaro/bootloader/edk2" />
   <project name="device/linaro/bootloader/OpenPlatformPkg" path="device/linaro/bootloader/OpenPlatformPkg" />
   <project groups="device,hikey,pdk" name="device/linaro/hikey" path="device/linaro/hikey" />
   <project clone-depth="1" groups="device,hikey,pdk" name="device/linaro/hikey-kernel" path="device/linaro/hikey-kernel" />
-  <project groups="device,poplar,pdk" name="device/linaro/poplar" path="device/linaro/poplar" />
-  <project clone-depth="1" groups="device,poplar,pdk" name="device/linaro/poplar-kernel" path="device/linaro/poplar-kernel" />
   <project groups="pdk" name="device/sample" path="device/sample" />
-  <project groups="device,beagle_x15,pdk" name="device/ti/beagle-x15" path="device/ti/beagle_x15" />
-  <project clone-depth="1" groups="device,beagle_x15,pdk" name="device/ti/beagle-x15-kernel" path="device/ti/beagle_x15-kernel" />
-  <project groups="pdk" name="platform/external/ARMComputeLibrary" path="external/ARMComputeLibrary" />
   <project groups="pdk" name="platform/external/aac" path="external/aac" />
-  <project groups="pdk" name="platform/external/adeb" path="external/adeb" />
+  <project groups="pdk" name="platform/external/abi-compliance-checker" path="external/abi-compliance-checker" />
+  <project groups="pdk" name="platform/external/abi-dumper" path="external/abi-dumper" />
   <project groups="pdk" name="platform/external/adhd" path="external/adhd" />
   <project groups="adt-infra,notdefault,pdk-fs" name="platform/external/adt-infra" path="external/adt-infra" />
   <project groups="pdk" name="platform/external/android-clat" path="external/android-clat" />
   <project groups="pdk" name="platform/external/androidplot" path="external/androidplot" />
+  <project groups="pdk" name="platform/external/annotation-tools" path="external/annotation-tools" />
   <project groups="pdk" name="platform/external/ant-glob" path="external/ant-glob" />
   <project groups="pdk" name="platform/external/antlr" path="external/antlr" />
-  <project groups="pdk" name="platform/external/apache-commons-bcel" path="external/apache-commons-bcel" />
-  <project groups="pdk" name="platform/external/apache-commons-compress" path="external/apache-commons-compress" />
   <project groups="pdk" name="platform/external/apache-commons-math" path="external/apache-commons-math" />
   <project groups="pdk" name="platform/external/apache-harmony" path="external/apache-harmony" />
   <project groups="pdk" name="platform/external/apache-http" path="external/apache-http" />
   <project groups="pdk" name="platform/external/apache-xml" path="external/apache-xml" />
   <project groups="pdk" name="platform/external/archive-patcher" path="external/archive-patcher" />
   <project groups="vendor" name="platform/external/arm-neon-tests" path="external/arm-neon-tests" />
-  <project groups="pdk" name="platform/external/arm-optimized-routines" path="external/arm-optimized-routines" />
   <project groups="pdk-fs" name="platform/external/autotest" path="external/autotest" />
   <project groups="pdk" name="platform/external/avb" path="external/avb" />
-  <project groups="pdk" name="platform/external/bcc" path="external/bcc" />
+  <project groups="pdk" name="platform/external/bart" path="external/bart" />
   <project groups="pdk" name="platform/external/blktrace" path="external/blktrace" />
   <project groups="pdk" name="platform/external/boringssl" path="external/boringssl" />
   <project groups="pdk" name="platform/external/bouncycastle" path="external/bouncycastle" />
@@ -106,13 +95,11 @@
   <project groups="pdk" name="platform/external/bzip2" path="external/bzip2" />
   <project groups="pdk" name="platform/external/caliper" path="external/caliper" />
   <project groups="pdk" name="platform/external/capstone" path="external/capstone" />
-  <project groups="pdk" name="platform/external/catch2" path="external/catch2" />
   <project groups="pdk" name="platform/external/cblas" path="external/cblas" />
   <project groups="pdk" name="platform/external/chromium-libpac" path="external/chromium-libpac" />
   <project groups="pdk" name="platform/external/chromium-trace" path="external/chromium-trace" />
   <project clone-depth="1" groups="pdk" name="platform/external/chromium-webview" path="external/chromium-webview" />
   <project groups="pdk" name="platform/external/clang" path="external/clang" />
-  <project groups="pdk" name="platform/external/cldr" path="external/cldr" />
   <project groups="pdk" name="platform/external/cmockery" path="external/cmockery" />
   <project groups="pdk" name="platform/external/cn-cbor" path="external/cn-cbor" />
   <project groups="pdk" name="platform/external/compiler-rt" path="external/compiler-rt" />
@@ -122,61 +109,53 @@
   <project groups="pdk" name="platform/external/curl" path="external/curl" />
   <project groups="pdk" name="platform/external/dagger2" path="external/dagger2" />
   <project groups="pdk-fs" name="platform/external/deqp" path="external/deqp" />
-  <project groups="pdk-fs" name="platform/external/deqp-deps/SPIRV-Headers" path="external/deqp-deps/SPIRV-Headers" />
-  <project groups="pdk-fs" name="platform/external/deqp-deps/SPIRV-Tools" path="external/deqp-deps/SPIRV-Tools" />
-  <project groups="pdk-fs" name="platform/external/deqp-deps/glslang" path="external/deqp-deps/glslang" />
   <project groups="pdk" name="platform/external/desugar" path="external/desugar" />
+  <project groups="pdk" name="platform/external/devlib" path="external/devlib" />
   <project groups="pdk" name="platform/external/dexmaker" path="external/dexmaker" />
+  <project groups="pdk" name="platform/external/dhcpcd-6.8.2" path="external/dhcpcd-6.8.2" />
   <project groups="pdk" name="platform/external/dlmalloc" path="external/dlmalloc" />
   <project groups="pdk" name="platform/external/dng_sdk" path="external/dng_sdk" />
   <project groups="pdk" name="platform/external/dnsmasq" path="external/dnsmasq" />
   <project groups="pdk" name="platform/external/doclava" path="external/doclava" />
-  <project groups="pdk" name="platform/external/dokka" path="external/dokka" />
+  <project groups="pdk" name="platform/external/drm_gralloc" path="external/drm_gralloc" />
   <project groups="drm_hwcomposer,pdk-fs" name="platform/external/drm_hwcomposer" path="external/drm_hwcomposer" />
   <project groups="pdk" name="platform/external/droiddriver" path="external/droiddriver" />
   <project groups="pdk" name="platform/external/drrickorang" path="external/drrickorang" />
   <project groups="pdk" name="platform/external/dtc" path="external/dtc" />
-  <project groups="pdk" name="platform/external/dynamic_depth" path="external/dynamic_depth" />
   <project groups="pdk" name="platform/external/e2fsprogs" path="external/e2fsprogs" />
   <project groups="pdk" name="platform/external/easymock" path="external/easymock" />
   <project groups="pdk" name="platform/external/eigen" path="external/eigen" />
   <project groups="pdk" name="platform/external/elfutils" path="external/elfutils" />
   <project groups="pdk" name="platform/external/emma" path="external/emma" />
-  <project groups="pdk" name="platform/external/epid-sdk" path="external/epid-sdk" />
   <project groups="pdk" name="platform/external/error_prone" path="external/error_prone" />
+  <project groups="pdk" name="platform/external/esd" path="external/esd" />
   <project groups="pdk" name="platform/external/expat" path="external/expat" />
+  <project groups="pdk" name="platform/external/eyes-free" path="external/eyes-free" />
   <project groups="pdk" name="platform/external/f2fs-tools" path="external/f2fs-tools" />
   <project groups="pdk" name="platform/external/fdlibm" path="external/fdlibm" />
   <project groups="pdk" name="platform/external/fec" path="external/fec" />
+  <project groups="pdk" name="platform/external/fio" path="external/fio" />
   <project groups="pdk" name="platform/external/flac" path="external/flac" />
   <project groups="pdk" name="platform/external/flatbuffers" path="external/flatbuffers" />
   <project groups="pdk" name="platform/external/fonttools" path="external/fonttools" />
   <project groups="pdk" name="platform/external/freetype" path="external/freetype" />
   <project groups="pdk" name="platform/external/fsck_msdos" path="external/fsck_msdos" />
-  <project groups="pdk" name="platform/external/fsverity-utils" path="external/fsverity-utils" />
   <project groups="pdk" name="platform/external/gemmlowp" path="external/gemmlowp" />
   <project groups="pdk" name="platform/external/gflags" path="external/gflags" />
   <project groups="pdk,qcom_msm8x26" name="platform/external/giflib" path="external/giflib" />
   <project groups="pdk" name="platform/external/glide" path="external/glide" />
   <project groups="pdk" name="platform/external/golang-protobuf" path="external/golang-protobuf" />
+  <project groups="pdk" name="platform/external/google-api-services-storage" path="external/google-api-services-storage" />
   <project groups="pdk" name="platform/external/google-benchmark" path="external/google-benchmark" />
   <project groups="pdk-fs" name="platform/external/google-breakpad" path="external/google-breakpad" />
-  <project groups="pdk" name="platform/external/google-fonts/arbutus-slab" path="external/google-fonts/arbutus-slab" />
-  <project groups="pdk" name="platform/external/google-fonts/arvo" path="external/google-fonts/arvo" />
   <project groups="pdk" name="platform/external/google-fonts/carrois-gothic-sc" path="external/google-fonts/carrois-gothic-sc" />
   <project groups="pdk" name="platform/external/google-fonts/coming-soon" path="external/google-fonts/coming-soon" />
   <project groups="pdk" name="platform/external/google-fonts/cutive-mono" path="external/google-fonts/cutive-mono" />
   <project groups="pdk" name="platform/external/google-fonts/dancing-script" path="external/google-fonts/dancing-script" />
-  <project groups="pdk" name="platform/external/google-fonts/lato" path="external/google-fonts/lato" />
-  <project groups="pdk" name="platform/external/google-fonts/source-sans-pro" path="external/google-fonts/source-sans-pro" />
-  <project groups="pdk" name="platform/external/google-fonts/rubik" path="external/google-fonts/rubik" />
-  <project groups="pdk" name="platform/external/google-fonts/zilla-slab" path="external/google-fonts/zilla-slab" />
-  <project groups="pdk" name="platform/external/google-fruit" path="external/google-fruit" />
   <project groups="pdk" name="platform/external/google-styleguide" path="external/google-styleguide" />
+  <project groups="pdk" name="platform/external/google-tv-pairing-protocol" path="external/google-tv-pairing-protocol" />
   <project groups="pdk" name="platform/external/googletest" path="external/googletest" />
   <project groups="pdk" name="platform/external/gptfdisk" path="external/gptfdisk" />
-  <project groups="pdk,tradefed" name="platform/external/grpc-grpc" path="external/grpc-grpc" />
-  <project groups="pdk,tradefed" name="platform/external/grpc-grpc-java" path="external/grpc-grpc-java" />
   <project groups="pdk" name="platform/external/guava" path="external/guava" />
   <project groups="pdk" name="platform/external/guice" path="external/guice" />
   <project groups="pdk" name="platform/external/hamcrest" path="external/hamcrest" />
@@ -185,9 +164,7 @@
   <project groups="pdk" name="platform/external/hyphenation-patterns" path="external/hyphenation-patterns" />
   <project groups="pdk" name="platform/external/icu" path="external/icu" />
   <project groups="pdk" name="platform/external/ImageMagick" path="external/ImageMagick" />
-  <project groups="pdk" name="platform/external/image_io" path="external/image_io" />
   <project groups="pdk" name="platform/external/ims" path="external/ims" />
-  <project groups="pdk" name="platform/external/iperf3" path="external/iperf3" />
   <project groups="pdk" name="platform/external/iproute2" path="external/iproute2" />
   <project groups="pdk" name="platform/external/ipsec-tools" path="external/ipsec-tools" />
   <project groups="pdk" name="platform/external/iptables" path="external/iptables" />
@@ -196,13 +173,13 @@
   <project groups="pdk" name="platform/external/jacoco" path="external/jacoco" />
   <project groups="pdk" name="platform/external/jarjar" path="external/jarjar" />
   <project groups="pdk" name="platform/external/javaparser" path="external/javaparser" />
-  <project groups="pdk" name="platform/external/javapoet" path="external/javapoet" />
   <project groups="pdk" name="platform/external/javasqlite" path="external/javasqlite" />
+  <project groups="pdk" name="platform/external/javassist" path="external/javassist" />
   <project groups="pdk" name="platform/external/jcommander" path="external/jcommander" />
   <project groups="pdk" name="platform/external/jdiff" path="external/jdiff" />
   <project groups="pdk" name="platform/external/jemalloc" path="external/jemalloc" />
-  <project groups="pdk" name="platform/external/jemalloc_new" path="external/jemalloc_new" />
   <project groups="pdk,tradefed,pdk-fs" name="platform/external/jline" path="external/jline" />
+  <project groups="pdk" name="platform/external/jmdns" path="external/jmdns" />
   <project groups="pdk" name="platform/external/jsilver" path="external/jsilver" />
   <project groups="pdk" name="platform/external/jsmn" path="external/jsmn" />
   <project groups="pdk" name="platform/external/jsoncpp" path="external/jsoncpp" />
@@ -214,19 +191,20 @@
   <project groups="pdk" name="platform/external/kmod" path="external/kmod" />
   <project groups="pdk" name="platform/external/kotlinc" path="external/kotlinc" />
   <project groups="pdk" name="platform/external/ksoap2" path="external/ksoap2" />
-  <project groups="pdk" name="platform/external/libaom" path="external/libaom" />
   <project groups="pdk" name="platform/external/libavc" path="external/libavc" />
   <project groups="pdk" name="platform/external/libbackup" path="external/libbackup" />
   <project groups="pdk" name="platform/external/libbrillo" path="external/libbrillo" />
   <project groups="pdk" name="platform/external/libcap" path="external/libcap" />
   <project groups="pdk" name="platform/external/libcap-ng" path="external/libcap-ng" />
   <project groups="pdk" name="platform/external/libchrome" path="external/libchrome" />
+  <project groups="pdk" name="platform/external/libconstrainedcrypto" path="external/libconstrainedcrypto" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/external/libcups" path="external/libcups" />
   <project groups="pdk" name="platform/external/libcxx" path="external/libcxx" />
   <project groups="pdk" name="platform/external/libcxxabi" path="external/libcxxabi" />
   <project groups="pdk" name="platform/external/libdaemon" path="external/libdaemon" />
   <project groups="pdk" name="platform/external/libdivsufsort" path="external/libdivsufsort" />
   <project groups="pdk" name="platform/external/libdrm" path="external/libdrm" />
+  <project groups="pdk" name="platform/external/libedit" path="external/libedit" />
   <project groups="pdk" name="platform/external/libese" path="external/libese" />
   <project groups="pdk" name="platform/external/libevent" path="external/libevent" />
   <project groups="pdk" name="platform/external/libexif" path="external/libexif" />
@@ -234,8 +212,9 @@
   <project groups="pdk" name="platform/external/libgsm" path="external/libgsm" />
   <project groups="pdk" name="platform/external/libhevc" path="external/libhevc" />
   <project groups="pdk" name="platform/external/libjpeg-turbo" path="external/libjpeg-turbo" />
-  <project groups="pdk" name="platform/external/libkmsxx" path="external/libkmsxx" />
   <project groups="pdk" name="platform/external/libldac" path="external/libldac" />
+  <project groups="pdk" name="platform/external/libmicrohttpd" path="external/libmicrohttpd" />
+  <project groups="pdk" name="platform/external/libmojo" path="external/libmojo" />
   <project groups="pdk" name="platform/external/libmpeg2" path="external/libmpeg2" />
   <project groups="pdk" name="platform/external/libmtp" path="external/libmtp" />
   <project groups="pdk" name="platform/external/libnetfilter_conntrack" path="external/libnetfilter_conntrack" />
@@ -246,13 +225,12 @@
   <project groups="pdk" name="platform/external/libpcap" path="external/libpcap" />
   <project groups="pdk" name="platform/external/libphonenumber" path="external/libphonenumber" />
   <project groups="pdk" name="platform/external/libpng" path="external/libpng" />
-  <project groups="pdk" name="platform/external/libprotobuf-mutator" path="external/libprotobuf-mutator" />
   <project groups="pdk" name="platform/external/libtextclassifier" path="external/libtextclassifier" />
   <project groups="pdk" name="platform/external/libunwind" path="external/libunwind" />
   <project groups="pdk" name="platform/external/libunwind_llvm" path="external/libunwind_llvm" />
   <project groups="pdk" name="platform/external/libusb" path="external/libusb" />
   <project groups="pdk" name="platform/external/libusb-compat" path="external/libusb-compat" />
-  <project groups="pdk" name="platform/external/libutf" path="external/libutf" />
+  <project groups="pdk" name="platform/external/libvncserver" path="external/libvncserver" />
   <project groups="pdk" name="platform/external/libvpx" path="external/libvpx" />
   <project groups="pdk" name="platform/external/libvterm" path="external/libvterm" />
   <project groups="pdk" name="platform/external/libxaac" path="external/libxaac" />
@@ -261,9 +239,9 @@
   <project groups="pdk,libxml2" name="platform/external/libxml2" path="external/libxml2" />
   <project groups="pdk,libyuv" name="platform/external/libyuv" path="external/libyuv" />
   <project groups="vts,pdk" name="platform/external/linux-kselftest" path="external/linux-kselftest" />
+  <project groups="pdk" name="platform/external/lisa" path="external/lisa" />
   <project groups="pdk" name="platform/external/llvm" path="external/llvm" />
   <project groups="pdk" name="platform/external/lmfit" path="external/lmfit" />
-  <project groups="pdk" name="platform/external/lua" path="external/lua" />
   <project groups="vts,pdk" name="platform/external/ltp" path="external/ltp" />
   <project groups="pdk" name="platform/external/lz4" path="external/lz4" />
   <project groups="pdk" name="platform/external/lzma" path="external/lzma" />
@@ -271,9 +249,9 @@
   <project groups="pdk" name="platform/external/mdnsresponder" path="external/mdnsresponder" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/external/mesa3d" path="external/mesa3d" />
   <project groups="pdk" name="platform/external/Microsoft-GSL" path="external/Microsoft-GSL" />
-  <project groups="pdk" name="platform/external/minigbm" path="external/minigbm" />
   <project groups="pdk" name="platform/external/minijail" path="external/minijail" />
   <project groups="pdk" name="platform/external/mksh" path="external/mksh" />
+  <project groups="pdk" name="platform/external/mmc-utils" path="external/mmc-utils" />
   <project groups="pdk" name="platform/external/mockftpserver" path="external/mockftpserver" />
   <project groups="pdk" name="platform/external/mockito" path="external/mockito" />
   <project groups="pdk" name="platform/external/mockwebserver" path="external/mockwebserver" />
@@ -283,23 +261,21 @@
   <project groups="pdk" name="platform/external/nanohttpd" path="external/nanohttpd" />
   <project groups="pdk" name="platform/external/nanopb-c" path="external/nanopb-c" />
   <project groups="pdk" name="platform/external/naver-fonts" path="external/naver-fonts" />
-  <project groups="pdk" name="platform/external/neon_2_sse" path="external/neon_2_sse" />
+  <project groups="pdk" name="platform/external/netcat" path="external/netcat" />
   <project groups="pdk" name="platform/external/neven" path="external/neven" />
-  <project groups="pdk" name="platform/external/newfs_msdos" path="external/newfs_msdos" />
   <project groups="pdk" name="platform/external/nfacct" path="external/nfacct" />
   <project groups="pdk" name="platform/external/nist-pkits" path="external/nist-pkits" />
   <project groups="pdk" name="platform/external/nist-sip" path="external/nist-sip" />
-  <project groups="pixel" name="platform/external/nos/host/android" path="external/nos/host/android" />
-  <project groups="pixel" name="platform/external/nos/host/generic" path="external/nos/host/generic" />
-  <project groups="pixel" name="platform/external/nos/test/system-test-harness" path="external/nos/test/system-test-harness" />
+  <project groups="pdk" name="platform/external/nos/host/android" path="external/nos/host/android" />
+  <project groups="pdk" name="platform/external/nos/host/generic" path="external/nos/host/generic" />
+  <project groups="pdk" name="platform/external/nos/test/system-test-harness" path="external/nos/test/system-test-harness" />
   <project groups="pdk" name="platform/external/noto-fonts" path="external/noto-fonts" />
   <project groups="pdk" name="platform/external/oauth" path="external/oauth" />
   <project groups="pdk" name="platform/external/objenesis" path="external/objenesis" />
   <project groups="pdk" name="platform/external/oj-libjdwp" path="external/oj-libjdwp" />
   <project groups="pdk" name="platform/external/okhttp" path="external/okhttp" />
   <project groups="pdk" name="platform/external/one-true-awk" path="external/one-true-awk" />
-  <project groups="pdk,tradefed" name="platform/external/opencensus-java" path="external/opencensus-java" />
-  <project groups="pdk" name="platform/external/openssh" path="external/openssh" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/external/opencv" path="external/opencv" />
   <project groups="pdk" name="platform/external/owasp/sanitizer" path="external/owasp/sanitizer" />
   <project groups="pdk" name="platform/external/parameter-framework" path="external/parameter-framework" />
   <project groups="pdk" name="platform/external/pcre" path="external/pcre" />
@@ -311,23 +287,14 @@
   <project groups="pdk" name="platform/external/ppp" path="external/ppp" />
   <project groups="pdk" name="platform/external/proguard" path="external/proguard" />
   <project groups="pdk" name="platform/external/protobuf" path="external/protobuf" />
-  <project groups="pdk" name="platform/external/protobuf-javalite" path="external/protobuf-javalite" />
   <project groups="pdk" name="platform/external/puffin" path="external/puffin" />
-  <project groups="pdk" name="platform/external/python/apitools" path="external/python/apitools" />
   <project groups="vts,pdk" name="platform/external/python/appdirs" path="external/python/appdirs" />
-  <project groups="pdk" name="platform/external/python/asn1crypto" path="external/python/asn1crypto" />
-  <project groups="pdk" name="platform/external/python/atomicwrites" path="external/python/atomicwrites" />
-  <project groups="pdk" name="platform/external/python/attrs" path="external/python/attrs" />
   <project groups="vts,pdk" name="platform/external/python/cachetools" path="external/python/cachetools" />
-  <project groups="pdk" name="platform/external/python/cffi" path="external/python/cffi" />
   <project groups="pdk" name="platform/external/python/cpython2" path="external/python/cpython2" />
   <project groups="pdk" name="platform/external/python/cpython3" path="external/python/cpython3" />
-  <project groups="pdk" name="platform/external/python/cryptography" path="external/python/cryptography" />
-  <project groups="pdk" name="platform/external/python/dateutil" path="external/python/dateutil" />
   <project groups="vts,pdk" name="platform/external/python/dill" path="external/python/dill" />
   <project groups="vts,pdk" name="platform/external/python/enum" path="external/python/enum" />
   <project groups="vts,pdk" name="platform/external/python/enum34" path="external/python/enum34" />
-  <project groups="pdk" name="platform/external/python/funcsigs" path="external/python/funcsigs" />
   <project groups="vts,pdk" name="platform/external/python/future" path="external/python/future" />
   <project groups="vts,pdk" name="platform/external/python/futures" path="external/python/futures" />
   <project groups="vts,pdk" name="platform/external/python/gapic-google-cloud-pubsub-v1" path="external/python/gapic-google-cloud-pubsub-v1" />
@@ -342,8 +309,6 @@
   <project groups="vts,pdk" name="platform/external/python/grpcio" path="external/python/grpcio" />
   <project groups="vts,pdk" name="platform/external/python/httplib2" path="external/python/httplib2" />
   <project groups="vts,pdk" name="platform/external/python/matplotlib" path="external/python/matplotlib" />
-  <project groups="pdk" name="platform/external/python/mock" path="external/python/mock" />
-  <project groups="pdk" name="platform/external/python/more-itertools" path="external/python/more-itertools" />
   <project groups="vts,pdk" name="platform/external/python/numpy" path="external/python/numpy" />
   <project groups="vts,pdk" name="platform/external/python/oauth2client" path="external/python/oauth2client" />
   <project groups="vts,pdk" name="platform/external/python/olefile" path="external/python/olefile" />
@@ -351,23 +316,17 @@
   <project groups="vts,pdk" name="platform/external/python/parse" path="external/python/parse" />
   <project groups="vts,pdk" name="platform/external/python/Pillow" path="external/python/Pillow" />
   <project groups="vts,pdk" name="platform/external/python/ply" path="external/python/ply" />
-  <project groups="pdk" name="platform/external/python/pluggy" path="external/python/pluggy" />
   <project groups="vts,pdk" name="platform/external/python/proto-google-cloud-pubsub-v1" path="external/python/proto-google-cloud-pubsub-v1" />
   <project groups="vts,pdk" name="platform/external/python/protobuf" path="external/python/protobuf" />
-  <project groups="pdk" name="platform/external/python/py" path="external/python/py" />
   <project groups="vts,pdk" name="platform/external/python/pyasn1" path="external/python/pyasn1" />
   <project groups="vts,pdk" name="platform/external/python/pyasn1-modules" path="external/python/pyasn1-modules" />
-  <project groups="pdk" name="platform/external/python/pycparser" path="external/python/pycparser" />
-  <project groups="pdk" name="platform/external/python/pyopenssl" path="external/python/pyopenssl" />
   <project groups="vts,pdk" name="platform/external/python/pyparsing" path="external/python/pyparsing" />
-  <project groups="pdk" name="platform/external/python/pytest" path="external/python/pytest" />
   <project groups="vts,pdk" name="platform/external/python/requests" path="external/python/requests" />
   <project groups="vts,pdk" name="platform/external/python/rsa" path="external/python/rsa" />
   <project groups="vts,pdk" name="platform/external/python/scipy" path="external/python/scipy" />
   <project groups="vts,pdk" name="platform/external/python/setuptools" path="external/python/setuptools" />
   <project groups="vts,pdk" name="platform/external/python/six" path="external/python/six" />
   <project groups="vts,pdk" name="platform/external/python/uritemplates" path="external/python/uritemplates" />
-  <project groups="pdk" name="platform/external/rapidjson" path="external/rapidjson" />
   <project groups="pdk" name="platform/external/rappor" path="external/rappor" />
   <project groups="pdk" name="platform/external/replicaisland" path="external/replicaisland" />
   <project groups="pdk" name="platform/external/rmi4utils" path="external/rmi4utils" />
@@ -375,13 +334,11 @@
   <project groups="pdk-cw-fs,pdk-fs" name="platform/external/robolectric-shadows" path="external/robolectric-shadows" />
   <project groups="pdk" name="platform/external/roboto-fonts" path="external/roboto-fonts" />
   <project groups="pdk" name="platform/external/rootdev" path="external/rootdev" />
-  <project groups="pdk" name="platform/external/Reactive-Extensions/RxCpp" path="external/Reactive-Extensions/RxCpp" />
+  <project groups="pdk" name="platform/external/safe-iop" path="external/safe-iop" />
   <project groups="pdk-fs" name="platform/external/scapy" path="external/scapy" />
   <project groups="pdk" name="platform/external/scrypt" path="external/scrypt" />
   <project groups="pdk" name="platform/external/seccomp-tests" path="external/seccomp-tests" />
   <project groups="pdk" name="platform/external/selinux" path="external/selinux" />
-  <project groups="pdk" name="platform/external/setupcompat" path="external/setupcompat" />
-  <project groups="pdk" name="platform/external/setupdesign" path="external/setupdesign" />
   <project groups="pdk,qcom_msm8x26" name="platform/external/sfntly" path="external/sfntly" />
   <project groups="pdk" name="platform/external/shaderc/spirv-headers" path="external/shaderc/spirv-headers" />
   <project groups="pdk" name="platform/external/shflags" path="external/shflags" />
@@ -399,53 +356,55 @@
   <project groups="pdk" name="platform/external/squashfs-tools" path="external/squashfs-tools" />
   <project groups="pdk" name="platform/external/strace" path="external/strace" />
   <project groups="pdk" name="platform/external/stressapptest" path="external/stressapptest" />
-  <project clone-depth="1" groups="pdk" name="platform/external/subsampling-scale-image-view" path="external/subsampling-scale-image-view" />
+  <project clone-depth="1" name="platform/external/subsampling-scale-image-view" path="external/subsampling-scale-image-view" />
   <project groups="pdk" name="platform/external/swiftshader" path="external/swiftshader" />
-  <project groups="projectarch,pdk" name="platform/external/syzkaller" path="external/syzkaller" />
+  <project groups="pdk" name="platform/external/syslinux" path="external/syslinux" />
   <project groups="pdk" name="platform/external/tagsoup" path="external/tagsoup" />
   <project groups="pdk" name="platform/external/tcpdump" path="external/tcpdump" />
   <project groups="pdk" name="platform/external/tensorflow" path="external/tensorflow" />
   <project groups="pdk" name="platform/external/testng" path="external/testng" />
+  <project groups="pdk" name="platform/external/timezonepicker-support" path="external/timezonepicker-support" />
   <project groups="pdk" name="platform/external/tinyalsa" path="external/tinyalsa" />
   <project groups="pdk" name="platform/external/tinycompress" path="external/tinycompress" />
   <project groups="pdk" name="platform/external/tinyxml" path="external/tinyxml" />
   <project groups="pdk" name="platform/external/tinyxml2" path="external/tinyxml2" />
   <project name="platform/external/toolchain-utils" path="external/toolchain-utils" />
   <project groups="pdk" name="platform/external/toybox" path="external/toybox" />
+  <project groups="pdk" name="platform/external/tpm2" path="external/tpm2" />
+  <project groups="pdk" name="platform/external/trappy" path="external/trappy" />
   <project groups="pdk" name="platform/external/tremolo" path="external/tremolo" />
   <project groups="pdk" name="platform/external/turbine" path="external/turbine" />
-  <project groups="pdk" name="platform/external/u-boot" path="external/u-boot" />
   <project groups="pdk" name="platform/external/unicode" path="external/unicode" />
   <project name="platform/external/universal-tween-engine" path="external/universal-tween-engine" />
-  <project groups="pdk" name="platform/external/ukey2" path="external/ukey2" />
   <project groups="pdk" name="platform/external/v4l2_codec2" path="external/v4l2_codec2" />
   <project groups="pdk" name="platform/external/v8" path="external/v8" />
+  <project groups="pdk" name="platform/external/valgrind" path="external/valgrind" />
   <project groups="vboot,pdk-fs" name="platform/external/vboot_reference" path="external/vboot_reference" />
-  <project groups="pdk" name="platform/external/virglrenderer" path="external/virglrenderer" />
   <project groups="pdk" name="platform/external/vixl" path="external/vixl" />
   <project groups="pdk" name="platform/external/vogar" path="external/vogar" />
   <project groups="pdk" name="platform/external/volley" path="external/volley" />
-  <project groups="pdk" name="platform/external/vulkan-headers" path="external/vulkan-headers" />
   <project groups="pdk" name="platform/external/vulkan-validation-layers" path="external/vulkan-validation-layers" />
   <project groups="pdk" name="platform/external/walt" path="external/walt" />
   <project groups="pdk" name="platform/external/wayland" path="external/wayland" />
   <project groups="pdk" name="platform/external/wayland-protocols" path="external/wayland-protocols" />
   <project groups="pdk,qcom_msm8x26" name="platform/external/webp" path="external/webp" />
   <project groups="pdk" name="platform/external/webrtc" path="external/webrtc" />
+  <project groups="pdk" name="platform/external/webview_support_interfaces" path="external/webview_support_interfaces" />
   <project groups="pdk" name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" />
   <project groups="pdk" name="platform/external/wycheproof" path="external/wycheproof" />
+  <project groups="pdk" name="platform/external/x264" path="external/x264" />
+  <project groups="pdk" name="platform/external/xmlrpcpp" path="external/xmlrpcpp" />
   <project groups="pdk" name="platform/external/xmp_toolkit" path="external/xmp_toolkit" />
   <project groups="pdk" name="platform/external/xz-embedded" path="external/xz-embedded" />
-  <project groups="pdk" name="platform/external/xz-java" path="external/xz-java" />
-  <project groups="vts,projectarch,pdk" name="platform/external/yapf" path="external/yapf" />
   <project groups="pdk" name="platform/external/zlib" path="external/zlib" />
   <project groups="pdk" name="platform/external/zopfli" path="external/zopfli" />
   <project groups="pdk" name="platform/external/zxing" path="external/zxing" />
-  <project groups="vts,pdk" name="platform/frameworks/av" path="frameworks/av" />
+  <project groups="pdk" name="platform/frameworks/av" path="frameworks/av" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/base" path="frameworks/base" />
   <project groups="pdk" name="platform/frameworks/compile/libbcc" path="frameworks/compile/libbcc" />
   <project groups="pdk" name="platform/frameworks/compile/mclinker" path="frameworks/compile/mclinker" />
   <project groups="pdk" name="platform/frameworks/compile/slang" path="frameworks/compile/slang" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/data-binding" path="frameworks/data-binding" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/ex" path="frameworks/ex" />
   <project groups="pdk" name="platform/frameworks/hardware/interfaces" path="frameworks/hardware/interfaces" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/layoutlib" path="frameworks/layoutlib" />
@@ -460,10 +419,11 @@
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/chips" path="frameworks/opt/chips" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/colorpicker" path="frameworks/opt/colorpicker" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/datetimepicker" path="frameworks/opt/datetimepicker" />
-  <project name="platform/frameworks/opt/gamesdk" path="frameworks/opt/gamesdk" />
+  <project groups="pdk-fs" name="platform/frameworks/opt/inputconnectioncommon" path="frameworks/opt/inputconnectioncommon" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/inputmethodcommon" path="frameworks/opt/inputmethodcommon" />
   <project groups="pdk-fs" name="platform/frameworks/opt/net/ethernet" path="frameworks/opt/net/ethernet" />
-  <project groups="pdk" name="platform/frameworks/opt/net/ike" path="frameworks/opt/net/ike" />
   <project groups="frameworks_ims,pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/net/ims" path="frameworks/opt/net/ims" />
+  <project groups="pdk-fs" name="platform/frameworks/opt/net/lowpan" path="frameworks/opt/net/lowpan" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/net/voip" path="frameworks/opt/net/voip" />
   <project groups="pdk" name="platform/frameworks/opt/net/wifi" path="frameworks/opt/net/wifi" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/photoviewer" path="frameworks/opt/photoviewer" />
@@ -472,18 +432,34 @@
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/timezonepicker" path="frameworks/opt/timezonepicker" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/opt/vcard" path="frameworks/opt/vcard" />
   <project groups="pdk" name="platform/frameworks/rs" path="frameworks/rs" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/support" path="frameworks/support" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/frameworks/wilhelm" path="frameworks/wilhelm" />
+  <project groups="pdk" name="platform/hardware/akm" path="hardware/akm" />
   <project groups="pdk" name="platform/hardware/broadcom/libbt" path="hardware/broadcom/libbt" />
   <project groups="pdk,broadcom_wlan" name="platform/hardware/broadcom/wlan" path="hardware/broadcom/wlan" />
   <project groups="pdk" name="platform/hardware/google/apf" path="hardware/google/apf" />
-  <project groups="pdk" name="platform/hardware/google/av" path="hardware/google/av" />
   <project groups="pdk,easel" name="platform/hardware/google/easel" path="hardware/google/easel" />
   <project groups="pdk" name="platform/hardware/google/interfaces" path="hardware/google/interfaces" />
-  <project groups="pixel" name="platform/hardware/google/pixel" path="hardware/google/pixel" />
+  <project groups="pdk" name="platform/hardware/google/av" path="hardware/google/av" />
+  <project groups="intel,pdk" name="platform/hardware/intel/audio_media" path="hardware/intel/audio_media" />
+  <project groups="intel,pdk" name="platform/hardware/intel/bootstub" path="hardware/intel/bootstub" />
+  <project groups="intel,pdk" name="platform/hardware/intel/common/bd_prov" path="hardware/intel/common/bd_prov" />
+  <project groups="intel,pdk" name="platform/hardware/intel/common/libmix" path="hardware/intel/common/libmix" />
+  <project groups="intel,pdk" name="platform/hardware/intel/common/libstagefrighthw" path="hardware/intel/common/libstagefrighthw" />
+  <project groups="intel,pdk" name="platform/hardware/intel/common/libva" path="hardware/intel/common/libva" />
+  <project groups="intel,pdk" name="platform/hardware/intel/common/libwsbm" path="hardware/intel/common/libwsbm" />
+  <project groups="intel,pdk" name="platform/hardware/intel/common/omx-components" path="hardware/intel/common/omx-components" />
+  <project groups="intel,pdk" name="platform/hardware/intel/common/utils" path="hardware/intel/common/utils" />
+  <project groups="intel,pdk" name="platform/hardware/intel/common/wrs_omxil_core" path="hardware/intel/common/wrs_omxil_core" />
+  <project groups="intel,pdk" name="platform/hardware/intel/img/hwcomposer" path="hardware/intel/img/hwcomposer" />
+  <project groups="intel,pdk" name="platform/hardware/intel/img/psb_headers" path="hardware/intel/img/psb_headers" />
+  <project groups="intel,pdk" name="platform/hardware/intel/img/psb_video" path="hardware/intel/img/psb_video" />
+  <project groups="intel_sensors,pdk" name="platform/hardware/intel/sensors" path="hardware/intel/sensors" />
   <project groups="pdk" name="platform/hardware/interfaces" path="hardware/interfaces" />
   <project groups="invensense,pdk" name="platform/hardware/invensense" path="hardware/invensense" />
   <project groups="pdk" name="platform/hardware/libhardware" path="hardware/libhardware" />
   <project groups="pdk" name="platform/hardware/libhardware_legacy" path="hardware/libhardware_legacy" />
+  <project groups="marvell_bt,pdk" name="platform/hardware/marvell/bt" path="hardware/marvell/bt" />
   <project groups="pdk" name="platform/hardware/nxp/nfc" path="hardware/nxp/nfc" />
   <project groups="pdk" name="platform/hardware/nxp/secure_element" path="hardware/nxp/secure_element" />
   <project groups="qcom,qcom_audio,pdk-qcom" name="platform/hardware/qcom/audio" path="hardware/qcom/audio" />
@@ -505,22 +481,10 @@
   <project groups="qcom_msm8x84,pdk-qcom" name="platform/hardware/qcom/msm8x84" path="hardware/qcom/msm8x84" />
   <project groups="wahoo" name="platform/hardware/qcom/neuralnetworks/hvxservice" path="hardware/qcom/neuralnetworks/hvxservice" />
   <project groups="qcom,pdk-qcom" name="platform/hardware/qcom/power" path="hardware/qcom/power" />
-  <project groups="qcom_sdm845" name="platform/hardware/qcom/sdm845/bt" path="hardware/qcom/sdm845/bt" />
-  <project groups="vendor,qcom_sdm845" name="platform/hardware/qcom/sdm845/data/ipacfg-mgr" path="hardware/qcom/sdm845/data/ipacfg-mgr">
-    <linkfile dest="hardware/qcom/sdm845/Android.mk" src="os_pickup.mk" />
-    <linkfile dest="hardware/qcom/sdm845/Android.bp" src="os_pickup.bp" />
-  </project>
-  <project groups="qcom_sdm845" name="platform/hardware/qcom/sdm845/display" path="hardware/qcom/sdm845/display" />
-  <project groups="qcom_sdm845" name="platform/hardware/qcom/sdm845/gps" path="hardware/qcom/sdm845/gps" />
-  <project groups="qcom_sdm845" name="platform/hardware/qcom/sdm845/media" path="hardware/qcom/sdm845/media" />
-  <project groups="generic_fs,qcom_sdm845" name="platform/hardware/qcom/sdm845/thermal" path="hardware/qcom/sdm845/thermal" />
-  <project groups="generic_fs,qcom_sdm845" name="platform/hardware/qcom/sdm845/vr" path="hardware/qcom/sdm845/vr" />
   <project groups="qcom_wlan,pdk-qcom" name="platform/hardware/qcom/wlan" path="hardware/qcom/wlan" />
   <project groups="pdk" name="platform/hardware/ril" path="hardware/ril" />
-  <project groups="pdk" name="platform/hardware/ti/am57x" path="hardware/ti/am57x" />
-  <project name="kernel/build" path="kernel/build" />
   <project groups="vts,pdk" name="kernel/configs" path="kernel/configs" />
-  <project groups="vts,pdk" name="kernel/tests" path="kernel/tests" />
+  <project name="kernel/tests" path="kernel/tests" />
   <project groups="pdk" name="platform/libcore" path="libcore" />
   <project groups="pdk" name="platform/libnativehelper" path="libnativehelper" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/BasicSmsReceiver" path="packages/apps/BasicSmsReceiver" />
@@ -528,25 +492,20 @@
   <project groups="pdk-fs" name="platform/packages/apps/Browser2" path="packages/apps/Browser2" />
   <project groups="pdk-fs" name="platform/packages/apps/Calendar" path="packages/apps/Calendar" />
   <project groups="pdk-fs" name="platform/packages/apps/Camera2" path="packages/apps/Camera2" />
-  <project groups="pdk-fs" name="platform/packages/apps/Car/Cluster" path="packages/apps/Car/Cluster" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Dialer" path="packages/apps/Car/Dialer" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Hvac" path="packages/apps/Car/Hvac" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/LatinIME" path="packages/apps/Car/LatinIME" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Launcher" path="packages/apps/Car/Launcher" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/LensPicker" path="packages/apps/Car/LensPicker" />
-  <project groups="pdk-fs" name="platform/packages/apps/Car/LinkViewer" path="packages/apps/Car/LinkViewer" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/LocalMediaPlayer" path="packages/apps/Car/LocalMediaPlayer" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Media" path="packages/apps/Car/Media" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Messenger" path="packages/apps/Car/Messenger" />
-  <project groups="pdk-fs" name="platform/packages/apps/Car/Notification" path="packages/apps/Car/Notification" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Overview" path="packages/apps/Car/Overview" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Radio" path="packages/apps/Car/Radio" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Settings" path="packages/apps/Car/Settings" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/Stream" path="packages/apps/Car/Stream" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/SystemUpdater" path="packages/apps/Car/SystemUpdater" />
-  <project groups="pdk-fs" name="platform/packages/apps/Car/externallibs" path="packages/apps/Car/externallibs" />
   <project groups="pdk-fs" name="platform/packages/apps/Car/libs" path="packages/apps/Car/libs" />
-  <project groups="pdk-fs" name="platform/packages/apps/Car/tests" path="packages/apps/Car/tests" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CarrierConfig" path="packages/apps/CarrierConfig" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CellBroadcastReceiver" path="packages/apps/CellBroadcastReceiver" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/CertInstaller" path="packages/apps/CertInstaller" />
@@ -557,10 +516,12 @@
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/DocumentsUI" path="packages/apps/DocumentsUI" />
   <project groups="pdk-fs" name="platform/packages/apps/Email" path="packages/apps/Email" />
   <project groups="pdk-fs" name="platform/packages/apps/EmergencyInfo" path="packages/apps/EmergencyInfo" />
+  <project groups="pdk-fs" name="platform/packages/apps/ExactCalculator" path="packages/apps/ExactCalculator" />
   <project groups="pdk-fs" name="platform/packages/apps/Gallery" path="packages/apps/Gallery" />
   <project groups="pdk-fs" name="platform/packages/apps/Gallery2" path="packages/apps/Gallery2" />
   <project groups="pdk-fs" name="platform/packages/apps/HTMLViewer" path="packages/apps/HTMLViewer" />
   <project groups="pdk-fs" name="platform/packages/apps/KeyChain" path="packages/apps/KeyChain" />
+  <project groups="pdk-fs" name="platform/packages/apps/Launcher2" path="packages/apps/Launcher2" />
   <project groups="pdk-fs" name="platform/packages/apps/Launcher3" path="packages/apps/Launcher3" />
   <project groups="pdk-fs" name="platform/packages/apps/LegacyCamera" path="packages/apps/LegacyCamera" />
   <project groups="pdk-fs" name="platform/packages/apps/ManagedProvisioning" path="packages/apps/ManagedProvisioning" />
@@ -569,13 +530,12 @@
   <project groups="pdk-fs" name="platform/packages/apps/MusicFX" path="packages/apps/MusicFX" />
   <project groups="apps_nfc,pdk-fs" name="platform/packages/apps/Nfc" path="packages/apps/Nfc" />
   <project groups="pdk-fs" name="platform/packages/apps/OneTimeInitializer" path="packages/apps/OneTimeInitializer" />
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PackageInstaller" path="packages/apps/PermissionController" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PackageInstaller" path="packages/apps/PackageInstaller" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/apps/PhoneCommon" path="packages/apps/PhoneCommon" />
   <project groups="pdk-fs" name="platform/packages/apps/Protips" path="packages/apps/Protips" />
   <project groups="pdk-fs" name="platform/packages/apps/Provision" path="packages/apps/Provision" />
   <project groups="pdk-fs" name="platform/packages/apps/QuickSearchBox" path="packages/apps/QuickSearchBox" />
   <project groups="pdk-fs" name="platform/packages/apps/SafetyRegulatoryInfo" path="packages/apps/SafetyRegulatoryInfo" />
-  <project groups="pdk-fs" name="platform/packages/apps/SampleLocationAttribution" path="packages/apps/SampleLocationAttribution" />
   <project groups="apps_se,pdk-fs" name="platform/packages/apps/SecureElement" path="packages/apps/SecureElement" />
   <project groups="pdk-fs" name="platform/packages/apps/Settings" path="packages/apps/Settings" />
   <project groups="pdk-fs" name="platform/packages/apps/SettingsIntelligence" path="packages/apps/SettingsIntelligence" />
@@ -588,21 +548,14 @@
   <project groups="pdk" name="platform/packages/apps/Test/connectivity" path="packages/apps/Test/connectivity" />
   <project groups="pdk" name="platform/packages/apps/TimeZoneData" path="packages/apps/TimeZoneData" />
   <project groups="pdk" name="platform/packages/apps/TimeZoneUpdater" path="packages/apps/TimeZoneUpdater" />
-  <project groups="pdk-fs" name="platform/packages/apps/ThemePicker" path="packages/apps/ThemePicker" />
   <project groups="pdk-fs" name="platform/packages/apps/Traceur" path="packages/apps/Traceur" />
   <project groups="pdk-fs" name="platform/packages/apps/TvSettings" path="packages/apps/TvSettings" />
-  <project groups="pdk" name="platform/packages/apps/TV" path="packages/apps/TV" />
+  <project name="platform/packages/apps/TV" path="packages/apps/TV" />
   <project groups="pdk-fs" name="platform/packages/apps/UnifiedEmail" path="packages/apps/UnifiedEmail" />
-  <project name="platform/packages/apps/UniversalMediaPlayer" path="packages/apps/UniversalMediaPlayer" />
   <project groups="pdk-fs" name="platform/packages/apps/WallpaperPicker" path="packages/apps/WallpaperPicker" />
-  <project groups="pdk-fs" name="platform/packages/apps/WallpaperPicker2" path="packages/apps/WallpaperPicker2" />
+  <project name="platform/packages/experimental" path="packages/experimental" />
   <project groups="pdk-fs" name="platform/packages/inputmethods/LatinIME" path="packages/inputmethods/LatinIME" />
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/CaptivePortalLogin" path="packages/modules/CaptivePortalLogin" />
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/ExtServices" path="packages/modules/ExtServices" />
-  <project groups="pdk" name="platform/packages/modules/ModuleMetadata" path="packages/modules/ModuleMetadata" />
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/NetworkPermissionConfig" path="packages/modules/NetworkPermissionConfig" />
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/modules/NetworkStack" path="packages/modules/NetworkStack" />
-  <project name="platform/packages/modules/TestModule" path="packages/modules/TestModule" />
+  <project groups="pdk-fs" name="platform/packages/inputmethods/OpenWnn" path="packages/inputmethods/OpenWnn" />
   <project groups="pdk-fs" name="platform/packages/providers/ApplicationsProvider" path="packages/providers/ApplicationsProvider" />
   <project groups="pdk-fs" name="platform/packages/providers/BlockedNumberProvider" path="packages/providers/BlockedNumberProvider" />
   <project groups="pdk-fs" name="platform/packages/providers/BookmarkProvider" path="packages/providers/BookmarkProvider" />
@@ -617,10 +570,11 @@
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/providers/UserDictionaryProvider" path="packages/providers/UserDictionaryProvider" />
   <project groups="pdk-fs" name="platform/packages/screensavers/Basic" path="packages/screensavers/Basic" />
   <project groups="pdk-fs" name="platform/packages/screensavers/PhotoTable" path="packages/screensavers/PhotoTable" />
+  <project groups="pdk-fs" name="platform/packages/screensavers/WebView" path="packages/screensavers/WebView" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/BuiltInPrintService" path="packages/services/BuiltInPrintService" />
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/AlternativeNetworkAccess" path="packages/services/AlternativeNetworkAccess" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Car" path="packages/services/Car" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Mms" path="packages/services/Mms" />
+  <project groups="pdk-fs" name="platform/packages/services/NetworkRecommendation" path="packages/services/NetworkRecommendation" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telecomm" path="packages/services/Telecomm" />
   <project groups="pdk-cw-fs,pdk-fs" name="platform/packages/services/Telephony" path="packages/services/Telephony" />
   <project groups="pdk-fs" name="platform/packages/wallpapers/LivePicker" path="packages/wallpapers/LivePicker" />
@@ -629,16 +583,14 @@
   <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/abi-dumps/ndk" path="prebuilts/abi-dumps/ndk" />
   <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/abi-dumps/vndk" path="prebuilts/abi-dumps/vndk" />
   <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/android-emulator" path="prebuilts/android-emulator" />
-  <project clone-depth="1" groups="pdk" name="platform/prebuilts/asuite" path="prebuilts/asuite" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" />
-  <project clone-depth="1" groups="pdk" name="platform/prebuilts/bundletool" path="prebuilts/bundletool" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/checkcolor" path="prebuilts/checkcolor" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/checkstyle" path="prebuilts/checkstyle" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/clang-tools" path="prebuilts/clang-tools" />
   <project clone-depth="1" groups="pdk,darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" />
+  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/deqp" path="prebuilts/deqp" />
   <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/devtools" path="prebuilts/devtools" />
-  <project clone-depth="1" groups="pdk-fs" name="platform/prebuilts/fuchsia_sdk" path="prebuilts/fuchsia_sdk" />
   <project clone-depth="1" 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" />
   <project clone-depth="1" groups="pdk,darwin,arm" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" />
   <project clone-depth="1" groups="pdk,darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" />
@@ -646,24 +598,24 @@
   <project clone-depth="1" groups="pdk,darwin,x86" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" />
   <project clone-depth="1" 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" />
   <project clone-depth="1" 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" />
-  <project clone-depth="1" 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" />
+  <project clone-depth="1" groups="pdk,linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" />
   <project clone-depth="1" 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" />
   <project clone-depth="1" 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" />
   <project clone-depth="1" 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" />
-  <project clone-depth="1" groups="darwin,pdk" name="platform/prebuilts/gdb/darwin-x86" path="prebuilts/gdb/darwin-x86" />
-  <project clone-depth="1" groups="linux,pdk" name="platform/prebuilts/gdb/linux-x86" path="prebuilts/gdb/linux-x86" />
+  <project clone-depth="1" groups="darwin" name="platform/prebuilts/gdb/darwin-x86" path="prebuilts/gdb/darwin-x86" />
+  <project clone-depth="1" groups="linux" name="platform/prebuilts/gdb/linux-x86" path="prebuilts/gdb/linux-x86" />
   <project clone-depth="1" groups="darwin,pdk,tradefed" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" />
   <project clone-depth="1" groups="linux,pdk,tradefed" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" />
   <project clone-depth="1" groups="pdk,pdk-cw-fs,pdk-fs" name="platform/prebuilts/gradle-plugin" path="prebuilts/gradle-plugin" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" />
-  <project clone-depth="1" groups="pdk" name="platform/prebuilts/manifest-merger" path="prebuilts/manifest-merger" />
+  <project clone-depth="1" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/libs/libedit" path="prebuilts/libs/libedit" />
   <project clone-depth="1" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/maven_repo/android" path="prebuilts/maven_repo/android" />
   <project clone-depth="1" groups="pdk-cw-fs,pdk-fs" name="platform/prebuilts/maven_repo/bumptech" path="prebuilts/maven_repo/bumptech" />
   <project clone-depth="1" name="platform/prebuilts/maven_repo/google-play-service-client-libraries-3p" path="prebuilts/maven_repo/google-play-service-client-libraries-3p" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/misc" path="prebuilts/misc" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/ndk" path="prebuilts/ndk" />
-  <project clone-depth="1" groups="pdk" name="platform/prebuilts/ktlint" path="prebuilts/ktlint" />
+  <project clone-depth="1" name="platform/prebuilts/ktlint" path="prebuilts/ktlint" />
   <project clone-depth="1" 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" />
   <project clone-depth="1" 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" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/qemu-kernel" path="prebuilts/qemu-kernel" />
@@ -671,15 +623,8 @@
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/sdk" path="prebuilts/sdk" />
   <project clone-depth="1" groups="pdk,tools" name="platform/prebuilts/tools" path="prebuilts/tools" />
   <project clone-depth="1" groups="pdk" name="platform/prebuilts/vndk/v27" path="prebuilts/vndk/v27" />
-  <project clone-depth="1" groups="pdk" name="platform/prebuilts/vndk/v28" path="prebuilts/vndk/v28" />
-  <project groups="pdk-cw-fs,pdk-fs" name="platform/sdk" path="sdk">
-    <linkfile dest="frameworks/support/README.md" src="current/androidx-README.md" />
-  </project>
-  <project groups="pdk" name="platform/system/apex" path="system/apex" />
-  <project groups="pdk" name="platform/system/ashmemd" path="system/ashmemd" />
+  <project groups="pdk-cw-fs,pdk-fs" name="platform/sdk" path="sdk" />
   <project groups="pdk" name="platform/system/bt" path="system/bt" />
-  <project groups="pdk" name="platform/system/bpf" path="system/bpf" />
-  <project groups="pdk" name="platform/system/bpfprogs" path="system/bpfprogs" />
   <project groups="pdk" name="platform/system/ca-certificates" path="system/ca-certificates" />
   <project groups="pdk" name="platform/system/chre" path="system/chre" />
   <project groups="pdk" name="platform/system/connectivity/wificond" path="system/connectivity/wificond" />
@@ -687,80 +632,65 @@
   <project groups="pdk" name="platform/system/core" path="system/core" />
   <project groups="pdk" name="platform/system/extras" path="system/extras" />
   <project groups="pdk" name="platform/system/gatekeeper" path="system/gatekeeper" />
-  <project groups="pdk" name="platform/system/gsid" path="system/gsid" />
   <project groups="pdk" name="platform/system/hardware/interfaces" path="system/hardware/interfaces" />
   <project groups="pdk" name="platform/system/hwservicemanager" path="system/hwservicemanager" />
-  <project groups="pdk" name="platform/system/iorap" path="system/iorap" />
+  <project groups="pdk" name="platform/system/iot/attestation" path="system/iot/attestation" />
   <project groups="pdk" name="platform/system/keymaster" path="system/keymaster" />
   <project groups="pdk" name="platform/system/libfmq" path="system/libfmq" />
   <project groups="pdk" name="platform/system/libhidl" path="system/libhidl" />
   <project groups="pdk" name="platform/system/libhwbinder" path="system/libhwbinder" />
-  <project groups="pdk" name="platform/system/libsysprop" path="system/libsysprop" />
   <project groups="pdk" name="platform/system/libufdt" path="system/libufdt" />
   <project groups="pdk" name="platform/system/libvintf" path="system/libvintf" />
-  <project groups="pdk" name="platform/system/linkerconfig" path="system/linkerconfig" />
   <project groups="pdk" name="platform/system/media" path="system/media" />
   <project groups="pdk" name="platform/system/netd" path="system/netd" />
   <project groups="pdk" name="platform/system/nfc" path="system/nfc" />
   <project groups="pdk" name="platform/system/nvram" path="system/nvram" />
   <project groups="pdk" name="platform/system/security" path="system/security" />
   <project groups="pdk" name="platform/system/sepolicy" path="system/sepolicy" />
-  <project groups="pdk" name="platform/system/server_configurable_flags" path="system/server_configurable_flags" />
-  <project groups="pdk" name="platform/system/testing/gtest_extras" path="system/testing/gtest_extras" />
   <project groups="pdk" name="platform/system/timezone" path="system/timezone" />
   <project groups="pdk" name="platform/system/tools/aidl" path="system/tools/aidl" />
   <project groups="pdk" name="platform/system/tools/hidl" path="system/tools/hidl" />
-  <project groups="pdk" name="platform/system/tools/sysprop" path="system/tools/sysprop" />
-  <project groups="pdk" name="platform/system/tools/xsdc" path="system/tools/xsdc" />
+  <project name="platform/system/tpm" path="system/tpm" />
   <project groups="pdk" name="platform/system/update_engine" path="system/update_engine" />
-  <project groups="pdk" name="platform/system/ucontainer" path="system/ucontainer" />
   <project groups="pdk" name="platform/system/vold" path="system/vold" />
-  <project groups="vts,projectarch,pdk" name="platform/test/framework" path="test/framework" />
-  <project groups="pdk" name="platform/test/mlts/benchmark" path="test/mlts/benchmark" />
-  <project groups="pdk" name="platform/test/mlts/models" path="test/mlts/models" />
-  <project name="platform/test/mts" path="test/mts" />
+  <project groups="vts,pdk" name="platform/test/framework" path="test/framework" />
   <project groups="cts,pdk-cw-fs,pdk-fs" name="platform/test/suite_harness" path="test/suite_harness" />
-  <project groups="vts,projectarch,pdk" name="platform/test/vti/alert" path="test/vti/alert" />
-  <project groups="vts,projectarch,pdk" name="platform/test/vti/dashboard" path="test/vti/dashboard" />
-  <project groups="vts,projectarch,pdk" name="platform/test/vti/fuzz_test_serving" path="test/vti/fuzz_test_serving" />
-  <project groups="vts,projectarch,pdk" name="platform/test/vti/test_serving" path="test/vti/test_serving" />
+  <project groups="vts,pdk" name="platform/test/vti/alert" path="test/vti/alert" />
+  <project groups="vts,pdk" name="platform/test/vti/dashboard" path="test/vti/dashboard" />
+  <project groups="vts,pdk" name="platform/test/vti/fuzz_test_serving" path="test/vti/fuzz_test_serving" />
+  <project groups="vts,pdk" name="platform/test/vti/test_serving" path="test/vti/test_serving" />
   <project groups="vts,pdk" name="platform/test/vts" path="test/vts" />
-  <project groups="vts,projectarch,pdk" name="platform/test/vts-testcase/fuzz" path="test/vts-testcase/fuzz" />
+  <project groups="vts,pdk" name="platform/test/vts-testcase/fuzz" path="test/vts-testcase/fuzz" />
   <project groups="vts,pdk" name="platform/test/vts-testcase/hal" path="test/vts-testcase/hal" />
   <project groups="vts,pdk" name="platform/test/vts-testcase/hal-trace" path="test/vts-testcase/hal-trace" />
   <project groups="vts,pdk" name="platform/test/vts-testcase/kernel" path="test/vts-testcase/kernel" />
-  <project groups="vts,projectarch,pdk" name="platform/test/vts-testcase/nbu" path="test/vts-testcase/nbu" />
-  <project groups="vts,projectarch,pdk" name="platform/test/vts-testcase/performance" path="test/vts-testcase/performance" />
-  <project groups="vts,projectarch,pdk" name="platform/test/vts-testcase/security" path="test/vts-testcase/security" />
+  <project groups="vts,pdk" name="platform/test/vts-testcase/nbu" path="test/vts-testcase/nbu" />
+  <project groups="vts,pdk" name="platform/test/vts-testcase/performance" path="test/vts-testcase/performance" />
+  <project groups="vts,pdk" name="platform/test/vts-testcase/security" path="test/vts-testcase/security" />
   <project groups="vts,pdk" name="platform/test/vts-testcase/vndk" path="test/vts-testcase/vndk" />
   <project name="toolchain/benchmark" path="toolchain/benchmark" />
+  <project groups="pdk" name="toolchain/binutils" path="toolchain/binutils" />
   <project groups="pdk" name="toolchain/pgo-profiles" path="toolchain/pgo-profiles" />
-  <project groups="tools,vts,projectarch,pdk,tradefed" name="platform/tools/acloud" path="tools/acloud" />
+  <project groups="tools,vts,pdk,tradefed" name="platform/tools/acloud" path="tools/acloud" />
+  <project name="platform/tools/appbundle" path="tools/appbundle" />
   <project groups="notdefault,tools" name="platform/tools/adt/idea" path="tools/adt/idea" />
   <project groups="pdk,tradefed" name="platform/tools/apksig" path="tools/apksig" />
   <project groups="pdk,tradefed" name="platform/tools/apkzlib" path="tools/apkzlib" />
-  <project groups="pdk" name="platform/tools/asuite" path="tools/asuite" />
   <project groups="notdefault,tools" name="platform/tools/base" path="tools/base" />
   <project groups="notdefault,tools" name="platform/tools/build" path="tools/build" />
-  <project groups="pdk" name="platform/tools/currysrc" path="tools/currysrc" />
   <project groups="tools,pdk-fs" name="platform/tools/dexter" path="tools/dexter" />
-  <project groups="tools" name="platform/tools/external_updater" path="tools/external_updater" />
   <project groups="tools" name="platform/tools/external/fat32lib" path="tools/external/fat32lib" />
   <project clone-depth="1" groups="tools" name="platform/tools/external/gradle" path="tools/external/gradle" />
   <project groups="notdefault,tools" name="platform/tools/idea" path="tools/idea" />
   <project groups="nopresubmit,pdk,tradefed" name="platform/tools/loganalysis" path="tools/loganalysis" />
   <project groups="pdk,tools" name="platform/tools/metalava" path="tools/metalava" />
   <project groups="notdefault,motodev" name="platform/tools/motodev" path="tools/motodev" />
-  <project groups="pdk" name="platform/tools/ndkports" path="tools/ndkports" />
   <project groups="adt-infra,cts,developers,motodev,pdk,tools,tradefed" name="platform/tools/repohooks" path="tools/repohooks" />
-  <project groups="pdk,tools" name="platform/tools/security" path="tools/security" />
   <project groups="notdefault,tools" name="platform/tools/studio/cloud" path="tools/studio/cloud" />
   <project groups="notdefault,tools" name="platform/tools/swt" path="tools/swt" />
   <project groups="pdk" name="platform/tools/test/connectivity" path="tools/test/connectivity" />
-  <project groups="pdk" name="platform/tools/test/graphicsbenchmark" path="tools/test/graphicsbenchmark" />
   <project groups="pdk,tradefed" name="platform/tools/tradefederation" path="tools/tradefederation/core" />
   <project groups="pdk,tradefed" name="platform/tools/tradefederation/contrib" path="tools/tradefederation/contrib" />
-  <project groups="tools,cts,pdk,pdk-cw-fs,pdk-fs" name="platform/tools/trebuchet" path="tools/trebuchet" />
 
   <repo-hooks enabled-list="pre-upload" in-project="platform/tools/repohooks" />