Manifest for Android CTS 5.1 Release 16 (3671561)

Change-Id: I02fb8830bc752610083e2464353ecd90a5456de4

default.xml

@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <manifest>
 
-  <remote  name="aosp"
-           fetch=".." />
-  <default revision="refs/tags/android-m-preview-1"
-           remote="aosp"
-           sync-j="4" />
+  <remote name="aosp" fetch=".." review="https://android-review.googlesource.com/"/>
+  <default revision="refs/tags/android-cts-5.1_r16" remote="aosp" sync-j="4"/>
 
   <project path="build" name="platform/build" groups="pdk,tradefed">
     <copyfile src="core/root.mk" dest="Makefile"/>
@@ -13,6 +10,7 @@
   <project path="abi/cpp" name="platform/abi/cpp" groups="pdk"/>
   <project path="art" name="platform/art" groups="pdk"/>
   <project path="bionic" name="platform/bionic" groups="pdk"/>
+  <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" groups="pdk-cw-fs"/>
   <project path="bootable/recovery" name="platform/bootable/recovery" groups="pdk"/>
   <project path="cts" name="platform/cts" groups="cts,pdk-cw-fs"/>
   <project path="dalvik" name="platform/dalvik" groups="pdk-cw-fs"/>
@@ -62,14 +60,15 @@
   <project path="external/antlr" name="platform/external/antlr" groups="pdk-cw-fs,tradefed"/>
   <project path="external/apache-harmony" name="platform/external/apache-harmony" groups="pdk-cw-fs"/>
   <project path="external/apache-http" name="platform/external/apache-http" groups="pdk-cw-fs"/>
+  <project path="external/apache-qp" name="platform/external/apache-qp" groups="pdk-cw-fs"/>
   <project path="external/apache-xml" name="platform/external/apache-xml" groups="pdk-cw-fs"/>
+  <project path="external/arduino" name="platform/external/arduino" groups="pdk-cw-fs"/>
   <project path="external/bison" name="platform/external/bison" groups="pdk"/>
   <project path="external/blktrace" name="platform/external/blktrace" groups="pdk-cw-fs"/>
-  <project path="external/boringssl" name="platform/external/boringssl" groups="pdk" />
+  <project path="external/bluetooth/bluedroid" name="platform/external/bluetooth/bluedroid" groups="pdk"/>
   <project path="external/bouncycastle" name="platform/external/bouncycastle" groups="pdk"/>
   <project path="external/bsdiff" name="platform/external/bsdiff" groups="pdk"/>
   <project path="external/bzip2" name="platform/external/bzip2" groups="pdk"/>
-  <project path="external/cblas" name="platform/external/cblas" />
   <project path="external/ceres-solver" name="platform/external/ceres-solver" groups="pdk-cw-fs"/>
   <project path="external/checkpolicy" name="platform/external/checkpolicy" groups="pdk"/>
   <project path="external/chromium-libpac" name="platform/external/chromium-libpac"/>
@@ -133,8 +132,11 @@
   <project path="external/fonttools" name="platform/external/fonttools"/>
   <project path="external/freetype" name="platform/external/freetype" groups="pdk"/>
   <project path="external/fsck_msdos" name="platform/external/fsck_msdos" groups="pdk-cw-fs"/>
+  <project path="external/gcc-demangle" name="platform/external/gcc-demangle" groups="pdk"/>
+  <project path="external/genext2fs" name="platform/external/genext2fs" groups="pdk-cw-fs"/>
   <project path="external/giflib" name="platform/external/giflib" groups="pdk-cw-fs,qcom_msm8x26"/>
   <project path="external/glide" name="platform/external/glide"/>
+  <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" groups="pdk-cw-fs"/>
   <project path="external/google-fonts/coming-soon" name="platform/external/google-fonts/coming-soon" groups="pdk-cw-fs"/>
   <project path="external/google-fonts/dancing-script" name="platform/external/google-fonts/dancing-script" groups="pdk-cw-fs"/>
   <project path="external/google-fonts/carrois-gothic-sc" name="platform/external/google-fonts/carrois-gothic-sc" groups="pdk-cw-fs"/>
@@ -166,7 +168,6 @@
   <project path="external/junit" name="platform/external/junit" groups="pdk-cw-fs,tradefed"/>
   <project path="external/ksoap2" name="platform/external/ksoap2" groups="pdk-cw-fs"/>
   <project path="external/kernel-headers" name="platform/external/kernel-headers" groups="pdk-cw-fs"/>
-  <project path="external/libavc" name="platform/external/libavc" />
   <project path="external/libcap-ng" name="platform/external/libcap-ng" groups="pdk-cw-fs"/>
   <project path="external/libcxx" name="platform/external/libcxx" groups="pdk"/>
   <project path="external/libcxxabi" name="platform/external/libcxxabi" groups="pdk"/>
@@ -175,7 +176,6 @@
   <project path="external/libhevc" name="platform/external/libhevc"/>
   <project path="external/libgsm" name="platform/external/libgsm" groups="pdk"/>
   <project path="external/liblzf" name="platform/external/liblzf" groups="pdk"/>
-  <project path="external/libmpeg2" name="platform/external/libmpeg2" />
   <project path="external/libmtp" name="platform/external/libmtp" groups="pdk-cw-fs"/>
   <project path="external/libnfc-nci" name="platform/external/libnfc-nci" groups="pdk"/>
   <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" groups="pdk"/>
@@ -195,24 +195,21 @@
   <project path="external/libutf" name="platform/external/libutf" groups="pdk-cw-fs"/>
   <project path="external/libvorbis" name="platform/external/libvorbis" groups="pdk-cw-fs"/>
   <project path="external/libvpx" name="platform/external/libvpx" groups="pdk"/>
-  <project path="external/libvterm" name="platform/external/libvterm" />
+  <project path="external/libvterm" name="platform/external/libvterm" groups="pdk-cw-fs"/>
   <project path="external/libxml2" name="platform/external/libxml2" groups="pdk-cw-fs"/>
   <project path="external/libyuv" name="platform/external/libyuv" groups="libyuv,pdk-cw-fs"/>
   <project path="external/linux-tools-perf" name="platform/external/linux-tools-perf" groups="pdk-cw-fs"/>
   <project path="external/littlemock" name="platform/external/littlemock" groups="pdk-cw-fs"/>
-  <project path="external/lld" name="platform/external/lld" />
   <project path="external/lldb" name="platform/external/lldb" groups="pdk-cw-fs"/>
   <project path="external/llvm" name="platform/external/llvm" groups="pdk"/>
   <project path="external/lohit-fonts" name="platform/external/lohit-fonts"/>
   <project path="external/ltrace" name="platform/external/ltrace" groups="pdk-cw-fs"/>
-  <project path="external/lz4" name="platform/external/lz4" groups="pdk-cw-fs" />
   <project path="external/lzma" name="platform/external/lzma" groups="pdk"/>
   <project path="external/markdown" name="platform/external/markdown" groups="pdk-cw-fs"/>
   <project path="external/mdnsresponder" name="platform/external/mdnsresponder" groups="pdk"/>
   <project path="external/mesa3d" name="platform/external/mesa3d" groups="pdk-cw-fs"/>
   <project path="external/messageformat" name="platform/external/messageformat" groups="pdk-cw-fs"/>
   <project path="external/mksh" name="platform/external/mksh" groups="pdk"/>
-  <project path="external/mockftpserver" name="platform/external/mockftpserver" />
   <project path="external/mockito" name="platform/external/mockito" groups="pdk-cw-fs"/>
   <project path="external/mockwebserver" name="platform/external/mockwebserver" groups="pdk-cw-fs"/>
   <project path="external/mp4parser" name="platform/external/mp4parser" groups="pdk-cw-fs"/>
@@ -231,31 +228,37 @@
   <project path="external/objenesis" name="platform/external/objenesis" groups="pdk-cw-fs"/>
   <project path="external/okhttp" name="platform/external/okhttp" groups="pdk-cw-fs"/>
   <project path="external/opencv" name="platform/external/opencv" groups="pdk-cw-fs"/>
+  <project path="external/openfst" name="platform/external/openfst" groups="pdk-cw-fs"/>
+  <project path="external/openssh" name="platform/external/openssh" groups="pdk-cw-fs"/>
+  <project path="external/openssl" name="platform/external/openssl" groups="pdk"/>
+  <project path="external/oprofile" name="platform/external/oprofile" groups="pdk-cw-fs"/>
   <project path="external/owasp/sanitizer" name="platform/external/owasp/sanitizer"/>
   <project path="external/pcre" name="platform/external/pcre" groups="pdk-cw-fs"/>
   <project path="external/pdfium" name="platform/external/pdfium" groups="pdk-cw-fs"/>
+  <project path="external/pixman" name="platform/external/pixman" groups="pdk-cw-fs"/>
   <project path="external/ppp" name="platform/external/ppp" groups="pdk-cw-fs"/>
   <project path="external/proguard" name="platform/external/proguard" groups="pdk-java,tradefed"/>
   <project path="external/protobuf" name="platform/external/protobuf" groups="pdk"/>
+  <project path="external/qemu" name="platform/external/qemu" groups="pdk-cw-fs"/>
+  <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" groups="pdk-cw-fs"/>
   <project path="external/regex-re2" name="platform/external/regex-re2" groups="pdk-cw-fs"/>
   <project path="external/replicaisland" name="platform/external/replicaisland" groups="pdk-cw-fs"/>
   <project path="external/robolectric" name="platform/external/robolectric" groups="pdk-cw-fs"/>
   <project path="external/safe-iop" name="platform/external/safe-iop" groups="pdk"/>
   <project path="external/scrypt" name="platform/external/scrypt" groups="pdk"/>
-  <project path="external/selinux" name="platform/external/selinux" />
   <project path="external/sepolicy" name="platform/external/sepolicy" groups="pdk"/>
   <project path="external/sfntly" name="platform/external/sfntly" groups="pdk-cw-fs,qcom_msm8x26"/>
   <project path="external/skia" name="platform/external/skia" groups="pdk-cw-fs,qcom_msm8x26"/>
-  <project path="external/slf4j" name="platform/external/slf4j" />
+  <project path="external/smack" name="platform/external/smack" groups="pdk-cw-fs"/>
   <project path="external/smali" name="platform/external/smali" groups="pdk-cw-fs"/>
-  <project path="external/sonic" name="platform/external/sonic" />
   <project path="external/sonivox" name="platform/external/sonivox" groups="pdk"/>
   <project path="external/speex" name="platform/external/speex" groups="pdk"/>
   <project path="external/sqlite" name="platform/external/sqlite" groups="pdk"/>
-  <project path="external/squashfs-tools" name="platform/external/squashfs-tools" groups="pdk" />
+  <project path="external/srec" name="platform/external/srec" groups="pdk-cw-fs"/>
   <project path="external/srtp" name="platform/external/srtp" groups="pdk-cw-fs"/>
   <project path="external/stlport" name="platform/external/stlport" groups="pdk"/>
   <project path="external/strace" name="platform/external/strace" groups="pdk-cw-fs"/>
+  <project path="external/stressapptest" name="platform/external/stressapptest" groups="pdk-cw-fs"/>
   <project path="external/svox" name="platform/external/svox" groups="pdk-cw-fs"/>
   <project path="external/tagsoup" name="platform/external/tagsoup" groups="pdk-cw-fs,tradefed"/>
   <project path="external/tcpdump" name="platform/external/tcpdump" groups="pdk,pdk-cw-fs"/>
@@ -264,17 +267,15 @@
   <project path="external/tinycompress" name="platform/external/tinycompress" groups="pdk"/>
   <project path="external/tinyxml" name="platform/external/tinyxml" groups="pdk"/>
   <project path="external/tinyxml2" name="platform/external/tinyxml2" groups="pdk"/>
-  <project path="external/toybox" name="platform/external/toybox" groups="pdk" />
   <project path="external/tremolo" name="platform/external/tremolo" groups="pdk"/>
-  <project path="external/v8" name="platform/external/v8" groups="pdk" />
   <project path="external/valgrind" name="platform/external/valgrind" groups="pdk"/>
   <project path="external/vixl" name="platform/external/vixl" groups="pdk"/>
-  <project path="external/vogar" name="platform/external/vogar" groups="pdk" />
   <project path="external/webp" name="platform/external/webp" groups="pdk-cw-fs,qcom_msm8x26"/>
   <project path="external/webrtc" name="platform/external/webrtc" groups="pdk"/>
   <project path="external/wpa_supplicant_8" name="platform/external/wpa_supplicant_8" groups="pdk"/>
   <project path="external/xmlwriter" name="platform/external/xmlwriter" groups="pdk-cw-fs"/>
   <project path="external/xmp_toolkit" name="platform/external/xmp_toolkit" groups="pdk-cw-fs"/>
+  <project path="external/yaffs2" name="platform/external/yaffs2" groups="pdk"/>
   <project path="external/zlib" name="platform/external/zlib" groups="pdk"/>
   <project path="external/zopfli" name="platform/external/zopfli" groups="pdk-cw-fs"/>
   <project path="external/zxing" name="platform/external/zxing" groups="pdk-cw-fs"/>
@@ -297,7 +298,6 @@
   <project path="frameworks/opt/colorpicker" name="platform/frameworks/opt/colorpicker" groups="pdk-cw-fs"/>
   <project path="frameworks/opt/datetimepicker" name="platform/frameworks/opt/datetimepicker" groups="pdk-cw-fs"/>
   <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" groups="pdk-cw-fs"/>
-  <project path="frameworks/opt/inputconnectioncommon" name="platform/frameworks/opt/inputconnectioncommon" />
   <project path="frameworks/opt/inputmethodcommon" name="platform/frameworks/opt/inputmethodcommon" groups="pdk-cw-fs"/>
   <project path="frameworks/opt/mms" name="platform/frameworks/opt/mms" groups="pdk-cw-fs"/>
   <project path="frameworks/opt/net/ims" name="platform/frameworks/opt/net/ims" groups="frameworks_ims,pdk-cw-fs"/>
@@ -405,11 +405,11 @@
   <project path="packages/apps/Terminal" name="platform/packages/apps/Terminal"/>
   <project path="packages/apps/TvSettings" name="platform/packages/apps/TvSettings"/>
   <project path="packages/apps/UnifiedEmail" name="platform/packages/apps/UnifiedEmail"/>
+  <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer"/>
   <project path="packages/experimental" name="platform/packages/experimental"/>
   <project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME"/>
   <project path="packages/inputmethods/OpenWnn" name="platform/packages/inputmethods/OpenWnn"/>
   <project path="packages/providers/ApplicationsProvider" name="platform/packages/providers/ApplicationsProvider"/>
-  <project path="packages/providers/BookmarkProvider" name="platform/packages/providers/BookmarkProvider" />
   <project path="packages/providers/CalendarProvider" name="platform/packages/providers/CalendarProvider" groups="pdk-cw-fs"/>
   <project path="packages/providers/ContactsProvider" name="platform/packages/providers/ContactsProvider" groups="pdk-cw-fs"/>
   <project path="packages/providers/DownloadProvider" name="platform/packages/providers/DownloadProvider" groups="pdk-cw-fs"/>
@@ -434,8 +434,20 @@
   <project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam"/>
   <project path="pdk" name="platform/pdk" groups="pdk"/>
   <project path="prebuilts/android-emulator" name="platform/prebuilts/android-emulator" clone-depth="1"/>
-  <project path="prebuilts/clang/darwin-x86/host/3.6" name="platform/prebuilts/clang/darwin-x86/host/3.6" groups="pdk,darwin" />
-  <project path="prebuilts/clang/linux-x86/host/3.6" name="platform/prebuilts/clang/linux-x86/host/3.6" groups="pdk,linux" />
+  <project path="prebuilts/clang/darwin-x86/3.1" name="platform/prebuilts/clang/darwin-x86/3.1" groups="pdk,darwin"/>
+  <project path="prebuilts/clang/darwin-x86/3.2" name="platform/prebuilts/clang/darwin-x86/3.2" groups="pdk,darwin"/>
+  <project path="prebuilts/clang/darwin-x86/arm/3.3" name="platform/prebuilts/clang/darwin-x86/arm/3.3" groups="arm,darwin,pdk-cw-fs"/>
+  <project path="prebuilts/clang/darwin-x86/host/3.4" name="platform/prebuilts/clang/darwin-x86/host/3.4" groups="pdk,darwin"/>
+  <project path="prebuilts/clang/darwin-x86/host/3.5" name="platform/prebuilts/clang/darwin-x86/host/3.5" groups="pdk,darwin"/>
+  <project path="prebuilts/clang/darwin-x86/mips/3.3" name="platform/prebuilts/clang/darwin-x86/mips/3.3" groups="darwin,mips,pdk-cw-fs"/>
+  <project path="prebuilts/clang/darwin-x86/x86/3.3" name="platform/prebuilts/clang/darwin-x86/x86/3.3" groups="darwin,pdk-cw-fs,x86"/>
+  <project path="prebuilts/clang/linux-x86/3.1" name="platform/prebuilts/clang/linux-x86/3.1" groups="pdk,linux"/>
+  <project path="prebuilts/clang/linux-x86/3.2" name="platform/prebuilts/clang/linux-x86/3.2" groups="pdk,linux"/>
+  <project path="prebuilts/clang/linux-x86/arm/3.3" name="platform/prebuilts/clang/linux-x86/arm/3.3" groups="arm,linux,pdk-cw-fs"/>
+  <project path="prebuilts/clang/linux-x86/host/3.4" name="platform/prebuilts/clang/linux-x86/host/3.4" groups="pdk,linux"/>
+  <project path="prebuilts/clang/linux-x86/host/3.5" name="platform/prebuilts/clang/linux-x86/host/3.5" groups="pdk,linux"/>
+  <project path="prebuilts/clang/linux-x86/mips/3.3" name="platform/prebuilts/clang/linux-x86/mips/3.3" groups="linux,mips,pdk-cw-fs"/>
+  <project path="prebuilts/clang/linux-x86/x86/3.3" name="platform/prebuilts/clang/linux-x86/x86/3.3" groups="linux,pdk-cw-fs,x86"/>
   <project path="prebuilts/devtools" name="platform/prebuilts/devtools"/>
   <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" groups="pdk"/>
   <project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" groups="notdefault,eclipse"/>
@@ -444,21 +456,23 @@
   <project path="prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9" groups="pdk,darwin,arm"/>
   <project path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.8" groups="pdk,darwin,arm"/>
   <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.8" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.8" groups="pdk,darwin,arm"/>
-  <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.9" />
   <project path="prebuilts/gcc/darwin-x86/host/headers" name="platform/prebuilts/gcc/darwin-x86/host/headers" groups="pdk,darwin"/>
   <project path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" groups="pdk,darwin"/>
   <project path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.9" groups="pdk,darwin,mips"/>
+  <project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.8" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.8" groups="pdk,darwin,mips"/>
+  <project path="prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.8" name="platform/prebuilts/gcc/darwin-x86/mips/mips64el-linux-android-4.8" groups="pdk,darwin,mips"/>
   <project path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.8" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.8" groups="pdk,darwin,x86"/>
   <project path="prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" name="platform/prebuilts/gcc/darwin-x86/x86/x86_64-linux-android-4.9" groups="pdk,darwin,x86"/>
   <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.8" groups="pdk,linux,arm"/>
   <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" groups="pdk,linux,arm"/>
   <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8" groups="pdk,linux,arm"/>
   <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8" groups="pdk,linux,arm"/>
-  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" />
+  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" groups="pdk,linux"/>
   <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8" groups="pdk,linux"/>
-  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" />
   <project path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8"/>
   <project path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" groups="pdk,linux,mips"/>
+  <project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.8" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.8" groups="pdk,linux,mips"/>
+  <project path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.8" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.8" groups="pdk,linux,mips"/>
   <project path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8" groups="pdk,linux,x86"/>
   <project path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" groups="pdk,linux,x86"/>
   <project path="prebuilts/gradle-plugin" name="platform/prebuilts/gradle-plugin" groups="pdk-cw-fs"/>
@@ -472,11 +486,8 @@
   <project path="prebuilts/sdk" name="platform/prebuilts/sdk" groups="pdk,tradefed"/>
   <project path="prebuilts/tools" name="platform/prebuilts/tools" groups="pdk,tools"/>
   <project path="sdk" name="platform/sdk" groups="pdk-cw-fs"/>
-  <project path="system/bt" name="platform/system/bt" groups="pdk" />
   <project path="system/core" name="platform/system/core" groups="pdk"/>
   <project path="system/extras" name="platform/system/extras" groups="pdk"/>
-  <project path="system/gatekeeper" name="platform/system/gatekeeper" groups="pdk" />
-  <project path="system/keyguard" name="platform/system/keyguard" />
   <project path="system/keymaster" name="platform/system/keymaster" groups="pdk"/>
   <project path="system/media" name="platform/system/media" groups="pdk"/>
   <project path="system/netd" name="platform/system/netd" groups="pdk"/>
@@ -495,5 +506,6 @@
   <project path="tools/studio/cloud" name="platform/tools/studio/cloud" groups="notdefault,tools"/>
   <project path="tools/studio/translation" name="platform/tools/studio/translation" groups="notdefault,tools"/>
   <project path="tools/swt" name="platform/tools/swt" groups="notdefault,tools"/>
+  <project path="tools/tradefederation" name="platform/tools/tradefederation" groups="notdefault,tradefed"/>
 
 </manifest>