Merge "Add external/lz4 to match internal manifest."
diff --git a/default.xml b/default.xml
index c7a48fc..16178ec 100644
--- a/default.xml
+++ b/default.xml
@@ -10,7 +10,7 @@
 
   <!-- Brillo-specific build tooling -->
   <project path="device/generic/brillo" name="device/generic/brillo" groups="bdk" />
-  <project path="tools/bdk" name="platform/tools/bdk" groups="bdk" />
+  <project path="tools/bdk" name="platform/tools/bdk" groups="bdk,bdk-cli" />
 
   <project path="external/gentoo/integration" name="platform/external/gentoo/integration" groups="bdk" />
   <project path="external/gentoo/overlays/gentoo" name="platform/external/gentoo/overlays/gentoo" groups="bdk" clone-depth="1" />
@@ -80,6 +80,7 @@
   <project path="external/libcap" name="platform/external/libcap" groups="bdk" />
   <project path="external/libcap-ng" name="platform/external/libcap-ng" groups="bdk" />
   <project path="external/libchrome" name="platform/external/libchrome" groups="bdk" />
+  <project path="external/libconstrainedcrypto" name="platform/external/libconstrainedcrypto" groups="bdk" />
   <project path="external/libcxx" name="platform/external/libcxx" groups="bdk" />
   <project path="external/libcxxabi" name="platform/external/libcxxabi" groups="bdk" />
   <project path="external/libdivsufsort" name="platform/external/libdivsufsort" groups="bdk" />
@@ -139,6 +140,7 @@
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" groups="bdk" />
   <project path="libnativehelper" name="platform/libnativehelper" groups="bdk" />
   <project path="prebuilts/android-emulator" name="platform/prebuilts/android-emulator" clone-depth="1" groups="bdk" />
+  <project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" groups="bdk" clone-depth="1" />
   <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" clone-depth="1" groups="linux,bdk" />
   <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="linux,arm,bdk" />
   <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" groups="linux,arm,bdk" />