diff --git a/default.xml b/default.xml
index 3d43007..a22525f 100644
--- a/default.xml
+++ b/default.xml
@@ -16,27 +16,28 @@
     <copyfile src="base/gradle.properties" dest="tools/gradle.properties"/>
   </project>
 
-  <project clone-depth="1" name="assets/android-studio-ux-assets" path="tools/assets"  />
   <project path="external/ant-glob" name="platform/external/ant-glob"/>
   <project path="external/boringssl" name="platform/external/boringssl"/>
-  <project path="tools/external/desugar" name="platform/external/desugar" />
+  <project path="external/dexter" name="platform/tools/dexter" />
   <project path="external/doclava" name="platform/external/doclava"/>
   <project path="external/gmock" name="platform/external/gmock" groups="gpu"/>
   <project path="external/gtest" name="platform/external/gtest"/>
   <project path="external/googletest" name="platform/external/googletest"/>
   <project path="external/iosched" name="platform/external/iosched"/>
+  <project path="external/libunwind" name="platform/external/libunwind" groups="notdefault,platform-linux,platform-darwin" />
   <project path="external/AntennaPod/AntennaPod" name="platform/external/AntennaPod/AntennaPod"/>
   <project path="external/AntennaPod/AudioPlayer" name="platform/external/AntennaPod/AudioPlayer"/>
   <project path="external/AntennaPod/afollestad" name="platform/external/AntennaPod/afollestad"/>
   <project path="external/gradle-perf-android-medium" name="platform/external/gradle-perf-android-medium"/>
   <project path="external/android-studio-gradle-test" name="platform/external/android-studio-gradle-test"/>
+  <project path="external/jetbrains/kotlin" name="platform/external/jetbrains/kotlin" />
   <project path="external/protobuf" name="platform/external/protobuf"/>
   <project path="external/nanopb-c" name="platform/external/nanopb-c"/>
   <project path="external/grpc-grpc" name="platform/external/grpc-grpc"/>
-  <project path="tools/external/r8" name="platform/external/r8" />
   <project path="external/smali" name="platform/external/smali"/>
   <project path="external/zlib" name="platform/external/zlib"/>
   <project path="tools/analytics-library" name="platform/tools/analytics-library"/>
+  <project path="tools/external/desugar" name="platform/external/desugar" />
   <project path="tools/external/go/src/golang.org/x/net" name="platform/tools/external/go/src/golang.org/x/net"/>
   <project path="tools/external/go/src/golang.org/x/tools" name="platform/tools/external/go/src/golang.org/x/tools"/>
   <project path="frameworks/native" name="platform/frameworks/native"/>
@@ -63,6 +64,8 @@
   <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="gpu,notdefault,platform-linux"/>
   <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="gpu,notdefault,platform-linux"/>
   <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="gpu,notdefault,platform-linux"/>
+  <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="notdefault,platform-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="notdefault,platform-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" groups="lldb,notdefault,platform-linux"/>
   <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/go/linux-x86" name="platform/prebuilts/go/linux-x86" groups="gpu,notdefault,platform-linux"/>
@@ -85,6 +88,7 @@
   <project path="prebuilts/ninja/windows-x86" name="platform/prebuilts/ninja/windows-x86" groups="lldb,notdefault,platform-cygwin_nt-6.1,platform-cygwin_nt-6.2,platform-cygwin_nt-6.3,platform-cygwin_nt-10.0"/>
   <project path="prebuilts/python/linux-x86" name="platform/prebuilts/python/linux-x86" groups="lldb,notdefault,linux"/>
   <project path="prebuilts/python/windows-x86" name="platform/prebuilts/python/windows-x86" groups="lldb,notdefault,windows"/>
+  <project path="prebuilts/r8" name="platform/prebuilts/r8" />
   <project path="prebuilts/studio/jdk" name="platform/prebuilts/studio/jdk"/>
   <project path="prebuilts/studio/layoutlib" name="platform/prebuilts/studio/layoutlib"/>
   <project path="prebuilts/swig/darwin-x86" name="platform/prebuilts/swig/darwin-x86" groups="lldb,notdefault,darwin"/>
@@ -95,14 +99,15 @@
   <project path="tools/adt/idea" name="platform/tools/adt/idea"/>
   <project path="tools/apksig" name="platform/tools/apksig"/>
   <project path="tools/dx/dalvik" name="platform/dalvik" groups="notdefault,platform-linux,platform-darwin"/>
+  <project path="tools/dx/libcore" name="platform/libcore" groups="notdefault,platform-linux,platform-darwin"/>
   <project path="tools/base" name="platform/tools/base">
     <copyfile src="bazel/tools.idea.BUILD" dest="tools/BUILD"/>
     <copyfile src="bazel/toplevel.WORKSPACE" dest="WORKSPACE"/>
-    <copyfile src="bazel/toplevel.bazel.rc" dest="tools/bazel.rc"/>
     <copyfile src="bazel/sdk/prebuilts.studio.sdk.BUILD" dest="prebuilts/studio/sdk/BUILD"/>
     <copyfile src="bazel/sdk/prebuilts.studio.sdk.README.md" dest="prebuilts/studio/sdk/README.md"/>
    </project>
   <project path="tools/data-binding" name="platform/frameworks/data-binding"/>
+  <project path="tools/apkzlib" name="platform/tools/apkzlib" />
   <project path="tools/external/fat32lib" name="platform/tools/external/fat32lib"/>
   <project path="tools/external/gradle" name="platform/tools/external/gradle"/>
   <project path="tools/gpu/src/android.googlesource.com/platform/tools/gpu" name="platform/tools/gpu" groups="gpu"/>