diff --git a/default.xml b/default.xml
index 2c58001..d380a43 100644
--- a/default.xml
+++ b/default.xml
@@ -4,22 +4,33 @@
   <remote name="aosp" fetch="https://android.googlesource.com/" />
   <default remote="origin" revision="master" />
 
-  <project path="build" name="build">
+  <project path="build" name="build" revision="tabba/kvmunittests">
     <linkfile src="Makefile" dest="Makefile" />
   </project>
-  <project path="buildroot" name="buildroot" revision="kvm-master" />
+  <project path="buildroot" name="buildroot" revision="tabba/kvmunittests" />
   <project path="kvmtool" name="kvmtool" />
-  <project path="kvm-unit-tests" name="kvm-unit-tests" />
+  <project path="kvm-unit-tests" name="kvm-unit-tests" revision="tabba/kvmunittests" />
   <project path="linux" name="linux" />
   <project path="misc" name="misc" />
-  <project path="prebuilts" name="prebuilts" />
+  <project path="prebuilts"
+           name="prebuilts"
+           revision="tabba/kvmunittests"
+           clone-depth="1" />
 
-  <project path="toolchains/clang/darwin-x86"
+  <project path="toolchains/darwin-x86/clang"
            name="platform/prebuilts/clang/host/darwin-x86"
            remote="aosp" revision="master"
            clone-depth="1" />
-  <project path="toolchains/clang/linux-x86"
+  <project path="toolchains/linux-x86/clang"
            name="platform/prebuilts/clang/host/linux-x86"
            remote="aosp" revision="master"
            clone-depth="1" />
+  <project path="toolchains/darwin-x86/gcc/aarch64-linux-android"
+           name="platform/prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9"
+           remote="aosp" revision="master"
+           clone-depth="1" />
+  <project path="toolchains/linux-x86/gcc/aarch64-linux-android"
+           name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9"
+           remote="aosp" revision="master"
+           clone-depth="1" />
 </manifest>