diff --git a/default.xml b/default.xml
index 0d78bf2..2824842 100644
--- a/default.xml
+++ b/default.xml
@@ -85,6 +85,8 @@
   <project path="test/linaro/biglittle/sched_tests" name="bL_tests/sched_tests" revision="master" remote="linaro-private" groups="vexpress-tests" />
   <project path="test/linaro/biglittle/task-placement-tests" name="bL_tests/task-placement-tests" revision="master" remote="linaro-private" groups="vexpress-tests" />
   <project path="external/linaro-android-kernel-test" name="android/linaro-android-kernel-test" revision="master" remote="linaro-private" groups="vexpress-tests"/>
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7-linaro" groups="linux,arm,common" revision="master" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8-linaro" groups="linux,arm,common" revision="master" />
   <!-- Linaro kernels -->
   <project path="kernel/linaro/arndale" name="landing-teams/working/samsung/kernel" remote="linaro-other" revision="tracking-android-arndale" groups="arndale" />
   <project path="kernel/linaro/pandaboard" name="kernel/panda" revision="linaro-tilt-android-tracking" groups="pandaboard"/>
@@ -207,313 +209,311 @@
   <project path="device/ti/uim" name="device/ti/uim" revision="android" groups="common" />
 
   <!-- AOSP -->
-  <project path="abi/cpp" name="platform/abi/cpp" groups="common" />
-  <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" groups="common" />
-  <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" groups="common" />
-  <project path="bootable/recovery" name="platform/bootable/recovery" groups="common" />
-  <project path="developers/build" name="platform/developers/build" groups="common" />
-  <project path="developers/demos" name="platform/developers/demos" groups="common" />
-  <project path="developers/docs" name="platform/developers/docs" groups="common" />
-  <project path="developers/samples/android" name="platform/developers/samples/android" groups="common" />
-  <project path="development" name="platform/development" groups="common" />
-  <project path="device/asus/deb" name="device/asus/deb" groups="device,flo" />
-  <project path="device/asus/flo" name="device/asus/flo" groups="device,flo" />
-  <project path="device/asus/flo-kernel" name="device/asus/flo-kernel" groups="device,flo" />
-  <project path="device/common" name="device/common" groups="common" />
-  <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="common" />
-  <project path="device/generic/common" name="device/generic/common" groups="common" />
-  <project path="device/generic/goldfish" name="device/generic/goldfish" groups="common" />
-  <project path="device/generic/mips" name="device/generic/mips" groups="common" />
-  <project path="device/generic/mini-emulator-armv7-a-neon" name="device/generic/mini-emulator-armv7-a-neon" groups="pdk" />
-  <project path="device/generic/mini-emulator-mips" name="device/generic/mini-emulator-mips" groups="pdk" />
-  <project path="device/generic/mini-emulator-x86" name="device/generic/mini-emulator-x86" groups="pdk" />
-  <project path="device/generic/x86" name="device/generic/x86" groups="common" />
-  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device,common" />
-  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device,common" />
-  <project path="device/lge/mako" name="device/lge/mako" revision="linaro-playground" groups="device,nexus4" />
-  <project path="device/lge/mako-kernel" name="device/lge/mako-kernel" groups="device,nexus4" />
-  <project path="device/sample" name="device/sample" groups="common" />
-  <project path="docs/source.android.com" name="platform/docs/source.android.com" groups="common" />
-  <project path="external/aac" name="platform/external/aac" groups="common" />
-  <project path="external/android-clat" name="platform/external/android-clat" groups="common" />
-  <project path="external/android-mock" name="platform/external/android-mock" groups="common" />
-  <project path="external/ant-glob" name="platform/external/ant-glob" groups="common" />
-  <project path="external/antlr" name="platform/external/antlr" groups="common" />
-  <project path="external/apache-harmony" name="platform/external/apache-harmony" groups="common" />
-  <project path="external/apache-http" name="platform/external/apache-http" groups="common" />
-  <project path="external/apache-qp" name="platform/external/apache-qp" groups="common" />
-  <project path="external/apache-xml" name="platform/external/apache-xml" groups="common" />
-  <project path="external/arduino" name="platform/external/arduino" groups="common" />
-  <project path="external/bison" name="platform/external/bison" groups="pdk,common" />
-  <project path="external/blktrace" name="platform/external/blktrace" groups="common" />
-  <project path="external/bouncycastle" name="platform/external/bouncycastle" groups="common" />
-  <project path="external/bsdiff" name="platform/external/bsdiff" groups="common" />
-  <project path="external/bzip2" name="platform/external/bzip2" groups="common" />
-  <project path="external/ceres-solver" name="platform/external/ceres-solver" groups="common" />
-  <project path="external/checkpolicy" name="platform/external/checkpolicy" groups="common,pdk" />
-  <project path="external/chromium-trace" name="platform/external/chromium-trace" groups="common" />
-  <project path="external/compiler-rt" name="platform/external/compiler-rt" groups="common" />
-  <project path="external/dexmaker" name="platform/external/dexmaker" groups="common" />
-  <project path="external/dhcpcd" name="platform/external/dhcpcd" groups="common" />
-  <project path="external/doclava" name="platform/external/doclava" groups="common" />
-  <project path="external/dropbear" name="platform/external/dropbear" groups="common" />
-  <project path="external/easymock" name="platform/external/easymock" groups="common" />
-  <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" groups="common" />
-  <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" groups="common" />
-  <project path="external/eigen" name="platform/external/eigen" groups="common" />
-  <project path="external/emma" name="platform/external/emma" groups="common" />
-  <project path="external/esd" name="platform/external/esd" groups="common" />
-  <project path="external/expat" name="platform/external/expat" groups="common" />
-  <project path="external/eyes-free" name="platform/external/eyes-free" groups="common" />
-  <project path="external/fdlibm" name="platform/external/fdlibm" groups="common" />
-  <project path="external/flac" name="platform/external/flac" groups="common" />
-  <project path="external/fsck_msdos" name="platform/external/fsck_msdos" groups="common" />
-  <project path="external/ganymed-ssh2" name="platform/external/ganymed-ssh2" groups="common" />
-  <project path="external/gcc-demangle" name="platform/external/gcc-demangle" groups="common" />
-  <project path="external/genext2fs" name="platform/external/genext2fs" groups="common" />
-  <project path="external/giflib" name="platform/external/giflib" groups="common" />
-  <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" groups="common" />
-  <project path="external/grub" name="platform/external/grub" groups="common" />
-  <project path="external/harfbuzz" name="platform/external/harfbuzz" groups="common" />
-  <project path="external/harfbuzz_ng" name="platform/external/harfbuzz_ng" groups="common" />
-  <project path="external/hamcrest" name="platform/external/hamcrest" groups="common" />
-  <project path="external/hyphenation" name="platform/external/hyphenation" groups="common" />
-  <project path="external/icu4c" name="platform/external/icu4c" groups="common" />
-  <project path="external/iproute2" name="platform/external/iproute2" groups="common" />
-  <project path="external/ipsec-tools" name="platform/external/ipsec-tools" groups="common" />
-  <project path="external/iptables" name="platform/external/iptables" groups="common" />
-  <project path="external/jack" name="platform/external/jack" groups="common" />
-  <project path="external/javasqlite" name="platform/external/javasqlite" groups="common" />
-  <project path="external/javassist" name="platform/external/javassist" groups="common" />
-  <project path="external/jdiff" name="platform/external/jdiff" groups="common" />
-  <project path="external/jhead" name="platform/external/jhead" groups="common" />
-  <project path="external/jmdns" name="platform/external/jmdns" groups="common" />
-  <project path="external/jmonkeyengine" name="platform/external/jmonkeyengine" groups="common" />
-  <project path="external/jsilver" name="platform/external/jsilver" groups="common" />
-  <project path="external/jsr305" name="platform/external/jsr305" groups="common" />
-  <project path="external/junit" name="platform/external/junit" groups="common" />
-  <project path="external/kernel-headers" name="platform/external/kernel-headers" groups="common" />
-  <project path="external/libcap-ng" name="platform/external/libcap-ng" groups="common" />
-  <project path="external/libffi" name="platform/external/libffi" groups="common" />
-  <project path="external/libgsm" name="platform/external/libgsm" groups="common,pdk" />
-  <project path="external/liblzf" name="platform/external/liblzf" groups="common" />
-  <project path="external/libmtp" name="platform/external/libmtp" groups="common" />
-  <project path="external/libnfc-nci" name="platform/external/libnfc-nci" groups="common" />
-  <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" groups="common" />
-  <project path="external/libnl-headers" name="platform/external/libnl-headers" groups="common" />
-  <project path="external/libogg" name="platform/external/libogg" groups="common" />
-  <project path="external/libpcap" name="platform/external/libpcap" groups="common" />
-  <project path="external/libphonenumber" name="platform/external/libphonenumber" groups="common" />
-  <project path="external/libpng" name="platform/external/libpng" groups="common" />
-  <project path="external/libppp" name="platform/external/libppp" groups="common" />
-  <project path="external/libselinux" name="platform/external/libselinux" groups="common,pdk" />
-  <project path="external/libsepol" name="platform/external/libsepol" groups="common,pdk" />
-  <project path="external/libusb" name="platform/external/libusb" groups="common" />
-  <project path="external/libusb_aah" name="platform/external/libusb_aah" groups="libusb_aah,common" />
-  <project path="external/libusb-compat" name="platform/external/libusb-compat" groups="common" />
-  <project path="external/libvorbis" name="platform/external/libvorbis" groups="common" />
-  <project path="external/libxml2" name="platform/external/libxml2" groups="common" />
-  <project path="external/libxslt" name="platform/external/libxslt" groups="common" />
-  <project path="external/libyuv" name="platform/external/libyuv" groups="common,libyuv" />
-  <project path="external/littlemock" name="platform/external/littlemock" groups="common" />
-  <project path="external/marisa-trie" name="platform/external/marisa-trie" groups="common" />
-  <project path="external/markdown" name="platform/external/markdown" groups="common" />
-  <project path="external/mdnsresponder" name="platform/external/mdnsresponder" groups="common" />
-  <project path="external/mksh" name="platform/external/mksh" groups="common" />
-  <project path="external/mockito" name="platform/external/mockito" groups="common" />
-  <project path="external/mockwebserver" name="platform/external/mockwebserver" groups="common" />
-  <project path="external/mp4parser" name="platform/external/mp4parser" groups="common" />
-  <project path="external/mtpd" name="platform/external/mtpd" groups="common" />
-  <project path="external/naver-fonts" name="platform/external/naver-fonts" groups="common" />
-  <project path="external/netcat" name="platform/external/netcat" groups="common" />
-  <project path="external/netperf" name="platform/external/netperf" groups="common" />
-  <project path="external/neven" name="platform/external/neven" groups="common" />
-  <project path="external/nist-pkits" name="platform/external/nist-pkits" groups="common" />
-  <project path="external/nist-sip" name="platform/external/nist-sip" groups="common" />
-  <project path="external/noto-fonts" name="platform/external/noto-fonts" groups="common" />
-  <project path="external/oauth" name="platform/external/oauth" groups="common" />
-  <project path="external/objenesis" name="platform/external/objenesis" groups="common" />
-  <project path="external/okhttp" name="platform/external/okhttp" groups="common" />
-  <project path="external/open-vcdiff" name="platform/external/open-vcdiff" groups="common" />
-  <project path="external/opencv" name="platform/external/opencv" groups="common" />
-  <project path="external/openfst" name="platform/external/openfst" groups="common" />
-  <project path="external/ppp" name="platform/external/ppp" groups="common" />
-  <project path="external/proguard" name="platform/external/proguard" groups="common" />
-  <project path="external/protobuf" name="platform/external/protobuf" groups="common" />
-  <project path="external/qemu" name="platform/external/qemu" groups="common" />
-  <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" groups="common" />
-  <project path="external/regex-re2" name="platform/external/regex-re2" groups="common" />
-  <project path="external/replicaisland" name="platform/external/replicaisland" groups="common" />
-  <project path="external/robolectric" name="platform/external/robolectric" groups="common" />
-  <project path="external/safe-iop" name="platform/external/safe-iop" groups="common" />
-  <project path="external/sepolicy" name="platform/external/sepolicy" groups="common,pdk" />
-  <project path="external/smack" name="platform/external/smack" groups="common" />
-  <project path="external/smali" name="platform/external/smali" groups="common" />
-  <project path="external/sqlite" name="platform/external/sqlite" groups="common" />
-  <project path="external/srec" name="platform/external/srec" groups="common" />
-  <project path="external/srtp" name="platform/external/srtp" groups="common" />
-  <project path="external/svox" name="platform/external/svox" groups="common" />
-  <project path="external/tagsoup" name="platform/external/tagsoup" groups="common" />
-  <project path="external/timezonepicker-support" name="platform/external/timezonepicker-support" groups="common" />
-  <project path="external/tinyalsa" name="platform/external/tinyalsa"  groups="common" />
-  <project path="external/tinyxml" name="platform/external/tinyxml" groups="common,pdk" />
-  <project path="external/tinyxml2" name="platform/external/tinyxml2" groups="common" />
-  <project path="external/webp" name="platform/external/webp" groups="common" />
-  <project path="external/webrtc" name="platform/external/webrtc" groups="common" />
-  <project path="external/xmlwriter" name="platform/external/xmlwriter" groups="common" />
-  <project path="external/xmp_toolkit" name="platform/external/xmp_toolkit" groups="common" />
-  <project path="external/yaffs2" name="platform/external/yaffs2" groups="common" />
-  <project path="external/zlib" name="platform/external/zlib" groups="common" />
-  <project path="external/zxing" name="platform/external/zxing" groups="common" />
-  <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" groups="common" />
-  <project path="frameworks/mff" name="platform/frameworks/mff" groups="common" />
-  <project path="frameworks/ml" name="platform/frameworks/ml" groups="common" />
-  <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" groups="common" />
-  <project path="frameworks/opt/carddav" name="platform/frameworks/opt/carddav" groups="common" />
-  <project path="frameworks/opt/colorpicker" name="platform/frameworks/opt/colorpicker" groups="common" />
-  <project path="frameworks/opt/datetimepicker" name="platform/frameworks/opt/datetimepicker" groups="common" />
-  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" groups="common" />
-  <project path="frameworks/opt/inputmethodcommon" name="platform/frameworks/opt/inputmethodcommon" groups="common" />
-  <project path="frameworks/opt/mailcommon" name="platform/frameworks/opt/mailcommon" groups="common" />
-  <project path="frameworks/opt/mms" name="platform/frameworks/opt/mms" groups="common" />
-  <project path="frameworks/opt/photoviewer" name="platform/frameworks/opt/photoviewer" groups="common" />
-  <project path="frameworks/opt/timezonepicker" name="platform/frameworks/opt/timezonepicker" groups="common" />
-  <project path="frameworks/opt/telephony" name="platform/frameworks/opt/telephony" groups="common,pdk" />
-  <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" groups="common" />
-  <project path="frameworks/support" name="platform/frameworks/support" groups="common" />
-  <project path="frameworks/testing" name="platform/frameworks/testing" groups="common" />
-  <project path="frameworks/volley" name="platform/frameworks/volley" groups="common" />
-  <project path="frameworks/webview" name="platform/frameworks/webview" groups="common" />
-  <project path="hardware/akm" name="platform/hardware/akm" groups="common" />
-  <project path="hardware/broadcom/libbt" name="platform/hardware/broadcom/libbt" groups="common,pdk" />
-  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" groups="common" />
-  <project path="hardware/invensense" name="platform/hardware/invensense" groups="common" />
+  <project path="abi/cpp" name="platform/abi/cpp" groups="common" remote="aosp-upstream" />
+  <project path="bootable/bootloader/legacy" name="platform/bootable/bootloader/legacy" groups="common" remote="aosp-upstream" />
+  <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" groups="common" remote="aosp-upstream" />
+  <project path="bootable/recovery" name="platform/bootable/recovery" groups="common" remote="aosp-upstream" />
+  <project path="developers/build" name="platform/developers/build" groups="common" remote="aosp-upstream" />
+  <project path="developers/demos" name="platform/developers/demos" groups="common" remote="aosp-upstream" />
+  <project path="developers/docs" name="platform/developers/docs" groups="common" remote="aosp-upstream" />
+  <project path="developers/samples/android" name="platform/developers/samples/android" groups="common" remote="aosp-upstream" />
+  <project path="development" name="platform/development" groups="common" remote="aosp-upstream" />
+  <project path="device/asus/deb" name="device/asus/deb" groups="device,flo" remote="aosp-upstream" />
+  <project path="device/asus/flo" name="device/asus/flo" groups="device,flo" remote="aosp-upstream" />
+  <project path="device/asus/flo-kernel" name="device/asus/flo-kernel" groups="device,flo" remote="aosp-upstream" />
+  <project path="device/common" name="device/common" groups="common" remote="aosp-upstream" />
+  <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="common" remote="aosp-upstream" />
+  <project path="device/generic/common" name="device/generic/common" groups="common" remote="aosp-upstream" />
+  <project path="device/generic/goldfish" name="device/generic/goldfish" groups="common" remote="aosp-upstream" />
+  <project path="device/generic/mips" name="device/generic/mips" groups="common" remote="aosp-upstream" />
+  <project path="device/generic/mini-emulator-armv7-a-neon" name="device/generic/mini-emulator-armv7-a-neon" groups="pdk" remote="aosp-upstream" />
+  <project path="device/generic/mini-emulator-mips" name="device/generic/mini-emulator-mips" groups="pdk" remote="aosp-upstream" />
+  <project path="device/generic/mini-emulator-x86" name="device/generic/mini-emulator-x86" groups="pdk" remote="aosp-upstream" />
+  <project path="device/generic/x86" name="device/generic/x86" groups="common" remote="aosp-upstream" />
+  <project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device,common" remote="aosp-upstream" />
+  <project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device,common" remote="aosp-upstream" />
+  <project path="device/lge/mako" name="device/lge/mako" revision="linaro-playground" groups="device,nexus4" remote="aosp-upstream" />
+  <project path="device/lge/mako-kernel" name="device/lge/mako-kernel" groups="device,nexus4" remote="aosp-upstream" />
+  <project path="device/sample" name="device/sample" groups="common" remote="aosp-upstream" />
+  <project path="docs/source.android.com" name="platform/docs/source.android.com" groups="common" remote="aosp-upstream" />
+  <project path="external/aac" name="platform/external/aac" groups="common" remote="aosp-upstream" />
+  <project path="external/android-clat" name="platform/external/android-clat" groups="common" remote="aosp-upstream" />
+  <project path="external/android-mock" name="platform/external/android-mock" groups="common" remote="aosp-upstream" />
+  <project path="external/ant-glob" name="platform/external/ant-glob" groups="common" remote="aosp-upstream" />
+  <project path="external/antlr" name="platform/external/antlr" groups="common" remote="aosp-upstream" />
+  <project path="external/apache-harmony" name="platform/external/apache-harmony" groups="common" remote="aosp-upstream" />
+  <project path="external/apache-http" name="platform/external/apache-http" groups="common" remote="aosp-upstream" />
+  <project path="external/apache-qp" name="platform/external/apache-qp" groups="common" remote="aosp-upstream" />
+  <project path="external/apache-xml" name="platform/external/apache-xml" groups="common" remote="aosp-upstream" />
+  <project path="external/arduino" name="platform/external/arduino" groups="common" remote="aosp-upstream" />
+  <project path="external/bison" name="platform/external/bison" groups="pdk,common" remote="aosp-upstream" />
+  <project path="external/blktrace" name="platform/external/blktrace" groups="common" remote="aosp-upstream" />
+  <project path="external/bouncycastle" name="platform/external/bouncycastle" groups="common" remote="aosp-upstream" />
+  <project path="external/bsdiff" name="platform/external/bsdiff" groups="common" remote="aosp-upstream" />
+  <project path="external/bzip2" name="platform/external/bzip2" groups="common" remote="aosp-upstream" />
+  <project path="external/ceres-solver" name="platform/external/ceres-solver" groups="common" remote="aosp-upstream" />
+  <project path="external/checkpolicy" name="platform/external/checkpolicy" groups="common,pdk" remote="aosp-upstream" />
+  <project path="external/chromium-trace" name="platform/external/chromium-trace" groups="common" remote="aosp-upstream" />
+  <project path="external/compiler-rt" name="platform/external/compiler-rt" groups="common" remote="aosp-upstream" />
+  <project path="external/dexmaker" name="platform/external/dexmaker" groups="common" remote="aosp-upstream" />
+  <project path="external/dhcpcd" name="platform/external/dhcpcd" groups="common" remote="aosp-upstream" />
+  <project path="external/doclava" name="platform/external/doclava" groups="common" remote="aosp-upstream" />
+  <project path="external/dropbear" name="platform/external/dropbear" groups="common" remote="aosp-upstream" />
+  <project path="external/easymock" name="platform/external/easymock" groups="common" remote="aosp-upstream" />
+  <project path="external/eclipse-basebuilder" name="platform/external/eclipse-basebuilder" groups="common" remote="aosp-upstream" />
+  <project path="external/eclipse-windowbuilder" name="platform/external/eclipse-windowbuilder" groups="common" remote="aosp-upstream" />
+  <project path="external/eigen" name="platform/external/eigen" groups="common" remote="aosp-upstream" />
+  <project path="external/emma" name="platform/external/emma" groups="common" remote="aosp-upstream" />
+  <project path="external/esd" name="platform/external/esd" groups="common" remote="aosp-upstream" />
+  <project path="external/expat" name="platform/external/expat" groups="common" remote="aosp-upstream" />
+  <project path="external/eyes-free" name="platform/external/eyes-free" groups="common" remote="aosp-upstream" />
+  <project path="external/fdlibm" name="platform/external/fdlibm" groups="common" remote="aosp-upstream" />
+  <project path="external/flac" name="platform/external/flac" groups="common" remote="aosp-upstream" />
+  <project path="external/fsck_msdos" name="platform/external/fsck_msdos" groups="common" remote="aosp-upstream" />
+  <project path="external/ganymed-ssh2" name="platform/external/ganymed-ssh2" groups="common" remote="aosp-upstream" />
+  <project path="external/gcc-demangle" name="platform/external/gcc-demangle" groups="common" remote="aosp-upstream" />
+  <project path="external/genext2fs" name="platform/external/genext2fs" groups="common" remote="aosp-upstream" />
+  <project path="external/giflib" name="platform/external/giflib" groups="common" remote="aosp-upstream" />
+  <project path="external/google-diff-match-patch" name="platform/external/google-diff-match-patch" groups="common" remote="aosp-upstream" />
+  <project path="external/grub" name="platform/external/grub" groups="common" remote="aosp-upstream" />
+  <project path="external/harfbuzz" name="platform/external/harfbuzz" groups="common" remote="aosp-upstream" />
+  <project path="external/harfbuzz_ng" name="platform/external/harfbuzz_ng" groups="common" remote="aosp-upstream" />
+  <project path="external/hamcrest" name="platform/external/hamcrest" groups="common" remote="aosp-upstream" />
+  <project path="external/hyphenation" name="platform/external/hyphenation" groups="common" remote="aosp-upstream" />
+  <project path="external/icu4c" name="platform/external/icu4c" groups="common" remote="aosp-upstream" />
+  <project path="external/iproute2" name="platform/external/iproute2" groups="common" remote="aosp-upstream" />
+  <project path="external/ipsec-tools" name="platform/external/ipsec-tools" groups="common" remote="aosp-upstream" />
+  <project path="external/iptables" name="platform/external/iptables" groups="common" remote="aosp-upstream" />
+  <project path="external/jack" name="platform/external/jack" groups="common" remote="aosp-upstream" />
+  <project path="external/javasqlite" name="platform/external/javasqlite" groups="common" remote="aosp-upstream" />
+  <project path="external/javassist" name="platform/external/javassist" groups="common" remote="aosp-upstream" />
+  <project path="external/jdiff" name="platform/external/jdiff" groups="common" remote="aosp-upstream" />
+  <project path="external/jhead" name="platform/external/jhead" groups="common" remote="aosp-upstream" />
+  <project path="external/jmdns" name="platform/external/jmdns" groups="common" remote="aosp-upstream" />
+  <project path="external/jmonkeyengine" name="platform/external/jmonkeyengine" groups="common" remote="aosp-upstream" />
+  <project path="external/jsilver" name="platform/external/jsilver" groups="common" remote="aosp-upstream" />
+  <project path="external/jsr305" name="platform/external/jsr305" groups="common" remote="aosp-upstream" />
+  <project path="external/junit" name="platform/external/junit" groups="common" remote="aosp-upstream" />
+  <project path="external/kernel-headers" name="platform/external/kernel-headers" groups="common" remote="aosp-upstream" />
+  <project path="external/libcap-ng" name="platform/external/libcap-ng" groups="common" remote="aosp-upstream" />
+  <project path="external/libffi" name="platform/external/libffi" groups="common" remote="aosp-upstream" />
+  <project path="external/libgsm" name="platform/external/libgsm" groups="common,pdk" remote="aosp-upstream" />
+  <project path="external/liblzf" name="platform/external/liblzf" groups="common" remote="aosp-upstream" />
+  <project path="external/libmtp" name="platform/external/libmtp" groups="common" remote="aosp-upstream" />
+  <project path="external/libnfc-nci" name="platform/external/libnfc-nci" groups="common" remote="aosp-upstream" />
+  <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" groups="common" remote="aosp-upstream" />
+  <project path="external/libnl-headers" name="platform/external/libnl-headers" groups="common" remote="aosp-upstream" />
+  <project path="external/libogg" name="platform/external/libogg" groups="common" remote="aosp-upstream" />
+  <project path="external/libpcap" name="platform/external/libpcap" groups="common" remote="aosp-upstream" />
+  <project path="external/libphonenumber" name="platform/external/libphonenumber" groups="common" remote="aosp-upstream" />
+  <project path="external/libpng" name="platform/external/libpng" groups="common" remote="aosp-upstream" />
+  <project path="external/libppp" name="platform/external/libppp" groups="common" remote="aosp-upstream" />
+  <project path="external/libselinux" name="platform/external/libselinux" groups="common,pdk" remote="aosp-upstream" />
+  <project path="external/libsepol" name="platform/external/libsepol" groups="common,pdk" remote="aosp-upstream" />
+  <project path="external/libusb" name="platform/external/libusb" groups="common" remote="aosp-upstream" />
+  <project path="external/libusb_aah" name="platform/external/libusb_aah" groups="libusb_aah,common" remote="aosp-upstream" />
+  <project path="external/libusb-compat" name="platform/external/libusb-compat" groups="common" remote="aosp-upstream" />
+  <project path="external/libvorbis" name="platform/external/libvorbis" groups="common" remote="aosp-upstream" />
+  <project path="external/libxml2" name="platform/external/libxml2" groups="common" remote="aosp-upstream" />
+  <project path="external/libxslt" name="platform/external/libxslt" groups="common" remote="aosp-upstream" />
+  <project path="external/libyuv" name="platform/external/libyuv" groups="common,libyuv" remote="aosp-upstream" />
+  <project path="external/littlemock" name="platform/external/littlemock" groups="common" remote="aosp-upstream" />
+  <project path="external/marisa-trie" name="platform/external/marisa-trie" groups="common" remote="aosp-upstream" />
+  <project path="external/markdown" name="platform/external/markdown" groups="common" remote="aosp-upstream" />
+  <project path="external/mdnsresponder" name="platform/external/mdnsresponder" groups="common" remote="aosp-upstream" />
+  <project path="external/mksh" name="platform/external/mksh" groups="common" remote="aosp-upstream" />
+  <project path="external/mockito" name="platform/external/mockito" groups="common" remote="aosp-upstream" />
+  <project path="external/mockwebserver" name="platform/external/mockwebserver" groups="common" remote="aosp-upstream" />
+  <project path="external/mp4parser" name="platform/external/mp4parser" groups="common" remote="aosp-upstream" />
+  <project path="external/mtpd" name="platform/external/mtpd" groups="common" remote="aosp-upstream" />
+  <project path="external/naver-fonts" name="platform/external/naver-fonts" groups="common" remote="aosp-upstream" />
+  <project path="external/netcat" name="platform/external/netcat" groups="common" remote="aosp-upstream" />
+  <project path="external/netperf" name="platform/external/netperf" groups="common" remote="aosp-upstream" />
+  <project path="external/neven" name="platform/external/neven" groups="common" remote="aosp-upstream" />
+  <project path="external/nist-pkits" name="platform/external/nist-pkits" groups="common" remote="aosp-upstream" />
+  <project path="external/nist-sip" name="platform/external/nist-sip" groups="common" remote="aosp-upstream" />
+  <project path="external/noto-fonts" name="platform/external/noto-fonts" groups="common" remote="aosp-upstream" />
+  <project path="external/oauth" name="platform/external/oauth" groups="common" remote="aosp-upstream" />
+  <project path="external/objenesis" name="platform/external/objenesis" groups="common" remote="aosp-upstream" />
+  <project path="external/okhttp" name="platform/external/okhttp" groups="common" remote="aosp-upstream" />
+  <project path="external/open-vcdiff" name="platform/external/open-vcdiff" groups="common" remote="aosp-upstream" />
+  <project path="external/opencv" name="platform/external/opencv" groups="common" remote="aosp-upstream" />
+  <project path="external/openfst" name="platform/external/openfst" groups="common" remote="aosp-upstream" />
+  <project path="external/ppp" name="platform/external/ppp" groups="common" remote="aosp-upstream" />
+  <project path="external/proguard" name="platform/external/proguard" groups="common" remote="aosp-upstream" />
+  <project path="external/protobuf" name="platform/external/protobuf" groups="common" remote="aosp-upstream" />
+  <project path="external/qemu" name="platform/external/qemu" groups="common" remote="aosp-upstream" />
+  <project path="external/qemu-pc-bios" name="platform/external/qemu-pc-bios" groups="common" remote="aosp-upstream" />
+  <project path="external/regex-re2" name="platform/external/regex-re2" groups="common" remote="aosp-upstream" />
+  <project path="external/replicaisland" name="platform/external/replicaisland" groups="common" remote="aosp-upstream" />
+  <project path="external/robolectric" name="platform/external/robolectric" groups="common" remote="aosp-upstream" />
+  <project path="external/safe-iop" name="platform/external/safe-iop" groups="common" remote="aosp-upstream" />
+  <project path="external/sepolicy" name="platform/external/sepolicy" groups="common,pdk" remote="aosp-upstream" />
+  <project path="external/smack" name="platform/external/smack" groups="common" remote="aosp-upstream" />
+  <project path="external/smali" name="platform/external/smali" groups="common" remote="aosp-upstream" />
+  <project path="external/sqlite" name="platform/external/sqlite" groups="common" remote="aosp-upstream" />
+  <project path="external/srec" name="platform/external/srec" groups="common" remote="aosp-upstream" />
+  <project path="external/srtp" name="platform/external/srtp" groups="common" remote="aosp-upstream" />
+  <project path="external/svox" name="platform/external/svox" groups="common" remote="aosp-upstream" />
+  <project path="external/tagsoup" name="platform/external/tagsoup" groups="common" remote="aosp-upstream" />
+  <project path="external/timezonepicker-support" name="platform/external/timezonepicker-support" groups="common" remote="aosp-upstream" />
+  <project path="external/tinyalsa" name="platform/external/tinyalsa"  groups="common" remote="aosp-upstream" />
+  <project path="external/tinyxml" name="platform/external/tinyxml" groups="common,pdk" remote="aosp-upstream" />
+  <project path="external/tinyxml2" name="platform/external/tinyxml2" groups="common" remote="aosp-upstream" />
+  <project path="external/webp" name="platform/external/webp" groups="common" remote="aosp-upstream" />
+  <project path="external/webrtc" name="platform/external/webrtc" groups="common" remote="aosp-upstream" />
+  <project path="external/xmlwriter" name="platform/external/xmlwriter" groups="common" remote="aosp-upstream" />
+  <project path="external/xmp_toolkit" name="platform/external/xmp_toolkit" groups="common" remote="aosp-upstream" />
+  <project path="external/yaffs2" name="platform/external/yaffs2" groups="common" remote="aosp-upstream" />
+  <project path="external/zlib" name="platform/external/zlib" groups="common" remote="aosp-upstream" />
+  <project path="external/zxing" name="platform/external/zxing" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/compile/mclinker" name="platform/frameworks/compile/mclinker" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/mff" name="platform/frameworks/mff" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/ml" name="platform/frameworks/ml" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/opt/calendar" name="platform/frameworks/opt/calendar" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/opt/carddav" name="platform/frameworks/opt/carddav" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/opt/colorpicker" name="platform/frameworks/opt/colorpicker" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/opt/datetimepicker" name="platform/frameworks/opt/datetimepicker" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/opt/inputmethodcommon" name="platform/frameworks/opt/inputmethodcommon" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/opt/mailcommon" name="platform/frameworks/opt/mailcommon" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/opt/mms" name="platform/frameworks/opt/mms" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/opt/photoviewer" name="platform/frameworks/opt/photoviewer" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/opt/timezonepicker" name="platform/frameworks/opt/timezonepicker" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/opt/telephony" name="platform/frameworks/opt/telephony" groups="common,pdk" remote="aosp-upstream" />
+  <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/support" name="platform/frameworks/support" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/testing" name="platform/frameworks/testing" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/volley" name="platform/frameworks/volley" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/webview" name="platform/frameworks/webview" groups="common" remote="aosp-upstream" />
+  <project path="hardware/akm" name="platform/hardware/akm" groups="common" remote="aosp-upstream" />
+  <project path="hardware/broadcom/libbt" name="platform/hardware/broadcom/libbt" groups="common,pdk" remote="aosp-upstream" />
+  <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" groups="common" remote="aosp-upstream" />
+  <project path="hardware/invensense" name="platform/hardware/invensense" groups="common" remote="aosp-upstream" />
   <!-- Linaro modifications: support building with gcc 4.8 -->
-  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" revision="linaro_android_4.3" groups="common" />
-  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" groups="common" />
-  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" groups="common" />
-  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" groups="common" />
-  <project path="hardware/msm7k" name="platform/hardware/msm7k" groups="nexus4" />
-  <project path="hardware/qcom/audio" name="platform/hardware/qcom/audio" groups="nexus4" />
-  <project path="hardware/qcom/bt" name="platform/hardware/qcom/bt" groups="nexus4" />
+  <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" revision="linaro_android_4.3" groups="common" remote="aosp-upstream" />
+  <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" groups="common" remote="aosp-upstream" />
+  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" groups="common" remote="aosp-upstream" />
+  <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" groups="common" remote="aosp-upstream" />
+  <project path="hardware/msm7k" name="platform/hardware/msm7k" groups="nexus4" remote="aosp-upstream" />
+  <project path="hardware/qcom/audio" name="platform/hardware/qcom/audio" groups="nexus4" remote="aosp-upstream" />
+  <project path="hardware/qcom/bt" name="platform/hardware/qcom/bt" groups="nexus4" remote="aosp-upstream" />
   <!-- Linaro modifications: support building with gcc 4.8 -->
-  <project path="hardware/qcom/display" name="platform/hardware/qcom/display" revision="linaro_android_4.3" groups="nexus4" />
-  <project path="hardware/qcom/keymaster" name="platform/hardware/qcom/keymaster" groups="nexus4" />
-  <project path="hardware/qcom/media" name="platform/hardware/qcom/media" revision="linaro_android_4.3" groups="nexus4" />
-  <project path="hardware/qcom/msm8960" name="platform/hardware/qcom/msm8960" groups="qcom_msm8960,nexus4" />
-  <project path="hardware/qcom/power" name="platform/hardware/qcom/power" groups="nexus4" />
-  <project path="hardware/qcom/sensors" name="platform/hardware/qcom/sensors" groups="nexus4" />
-  <project path="hardware/qcom/wlan" name="platform/hardware/qcom/wlan" groups="nexus4" />
-  <project path="libnativehelper" name="platform/libnativehelper" groups="common" />
-  <project path="ndk" name="platform/ndk" groups="common" />
-  <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" groups="common" />
-  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" groups="common" />
-  <project path="packages/apps/Browser" name="platform/packages/apps/Browser" groups="common" />
-  <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" groups="common" />
-  <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" groups="common" />
-  <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" groups="common" />
-  <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" groups="common" />
-  <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" groups="common" />
-  <project path="packages/apps/ContactsCommon" name="platform/packages/apps/ContactsCommon" groups="common"/>
-  <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" groups="common" />
-  <project path="packages/apps/Dialer" name="platform/packages/apps/Dialer" groups="common" />
-  <project path="packages/apps/Email" name="platform/packages/apps/Email" groups="common" />
-  <project path="packages/apps/Exchange" name="platform/packages/apps/Exchange" groups="common" />
-  <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" groups="common" />
-  <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" groups="common" />
-  <project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" groups="common" />
-  <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" groups="common" />
-  <project path="packages/apps/Mms" name="platform/packages/apps/Mms" groups="common" />
-  <project path="packages/apps/Music" name="platform/packages/apps/Music" groups="common" />
-  <project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" groups="common" />
-  <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" groups="common" />
-  <project path="packages/apps/OneTimeInitializer" name="platform/packages/apps/OneTimeInitializer" groups="common" />
-  <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" groups="common" />
-  <project path="packages/apps/Phone" name="platform/packages/apps/Phone" groups="common" />
-  <project path="packages/apps/PhoneCommon" name="platform/packages/apps/PhoneCommon" groups="common"/>
-  <project path="packages/apps/Protips" name="platform/packages/apps/Protips" groups="common" />
-  <project path="packages/apps/Provision" name="platform/packages/apps/Provision" groups="common" />
-  <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" groups="common" />
-  <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" groups="common" />
-  <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" groups="common" />
-  <project path="packages/apps/SpareParts" name="platform/packages/apps/SpareParts" groups="common" />
-  <project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" groups="common" />
-  <project path="packages/apps/Stk" name="platform/packages/apps/Stk" groups="common" />
-  <project path="packages/apps/Tag" name="platform/packages/apps/Tag" groups="common" />
-  <project path="packages/apps/VideoEditor" name="platform/packages/apps/VideoEditor" groups="common" />
-  <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer" groups="common" />
-  <project path="packages/experimental" name="platform/packages/experimental" groups="common" />
-  <project path="packages/inputmethods/PinyinIME" name="platform/packages/inputmethods/PinyinIME" groups="common" />
-  <project path="packages/providers/ApplicationsProvider" name="platform/packages/providers/ApplicationsProvider" groups="common" />
-  <project path="packages/providers/CalendarProvider" name="platform/packages/providers/CalendarProvider" groups="common" />
-  <project path="packages/providers/ContactsProvider" name="platform/packages/providers/ContactsProvider" groups="common" />
-  <project path="packages/providers/DownloadProvider" name="platform/packages/providers/DownloadProvider" groups="common" />
-  <project path="packages/providers/DrmProvider" name="platform/packages/providers/DrmProvider" groups="common" />
-  <project path="packages/providers/MediaProvider" name="platform/packages/providers/MediaProvider" groups="common" />
-  <project path="packages/providers/PartnerBookmarksProvider" name="platform/packages/providers/PartnerBookmarksProvider" groups="common" />
-  <project path="packages/providers/TelephonyProvider" name="platform/packages/providers/TelephonyProvider" groups="common" />
-  <project path="packages/providers/UserDictionaryProvider" name="platform/packages/providers/UserDictionaryProvider" groups="common" />
-  <project path="packages/screensavers/Basic" name="platform/packages/screensavers/Basic" groups="common" />
-  <project path="packages/screensavers/PhotoTable" name="platform/packages/screensavers/PhotoTable" groups="common" />
-  <project path="packages/screensavers/WebView" name="platform/packages/screensavers/WebView" groups="common" />
-  <project path="packages/wallpapers/Basic" name="platform/packages/wallpapers/Basic" groups="common" />
-  <project path="packages/wallpapers/Galaxy4" name="platform/packages/wallpapers/Galaxy4" groups="common" />
-  <project path="packages/wallpapers/HoloSpiral" name="platform/packages/wallpapers/HoloSpiral" groups="common" />
-  <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" groups="common" />
-  <project path="packages/wallpapers/MagicSmoke" name="platform/packages/wallpapers/MagicSmoke" groups="common" />
-  <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" groups="common" />
-  <project path="packages/wallpapers/NoiseField" name="platform/packages/wallpapers/NoiseField" groups="common" />
-  <project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" groups="common" />
-  <project path="pdk" name="platform/pdk" groups="common" />
-  <project path="prebuilts/clang/darwin-x86/3.1" name="platform/prebuilts/clang/darwin-x86/3.1" groups="darwin,common" />
-  <project path="prebuilts/clang/darwin-x86/3.2" name="platform/prebuilts/clang/darwin-x86/3.2" groups="darwin,common" />
-  <project path="prebuilts/clang/linux-x86/3.1" name="platform/prebuilts/clang/linux-x86/3.1" groups="linux,common" />
-  <project path="prebuilts/clang/linux-x86/3.2" name="platform/prebuilts/clang/linux-x86/3.2" groups="linux,common" />
-  <project path="prebuilts/devtools" name="platform/prebuilts/devtools" groups="common" />
-  <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" groups="common" />
-  <project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" groups="notdefault,eclipse" />
-  <project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" groups="notdefault,eclipse" />
-  <project path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" groups="darwin,arm,common" />
-  <project path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.7" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.7" groups="common,pdk,darwin,arm" />
-  <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" groups="darwin,arm,common" />
-  <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.7" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.7" groups="common,pdk,darwin,arm" />
-  <project path="prebuilts/gcc/darwin-x86/host/headers" name="platform/prebuilts/gcc/darwin-x86/host/headers" groups="common,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="common,pdk,darwin" />
-  <project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" groups="darwin,mips" />
-  <project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.7" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.7" groups="pdk,darwin,mips" />
-  <project path="prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" groups="darwin,x86,common" />
-  <project path="prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.7" name="platform/prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.7" groups="pdk,darwin,x86,common" />
-  <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" groups="linux,arm,common" />
-  <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" groups="pdk,linux,arm,common" />
-  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7-linaro" groups="linux,arm,common" revision="master" />
-  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8-linaro" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8-linaro" groups="linux,arm,common" revision="master" />
-  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" groups="linux,arm,common" />
-  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" groups="pdk,linux,arm,common" />
-  <project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" groups="linux,common" />
-  <project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" groups="linux,common" />
-  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" groups="linux,common" />
-  <project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" groups="linux,mips" />
-  <project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.7" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.7" groups="pdk,linux,mips" />
-  <project path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" groups="linux,x86,common" />
-  <project path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7" groups="pdk,linux,x86,common" />
-  <project path="prebuilts/misc" name="platform/prebuilts/misc" groups="common" />
-  <project path="prebuilts/ndk" name="platform/prebuilts/ndk" groups="common" />
-  <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" groups="common" />
-  <project path="prebuilts/sdk" name="platform/prebuilts/sdk" groups="common" />
-  <project path="prebuilts/tools" name="platform/prebuilts/tools" groups="common,pdk,tools" />
-  <project path="sdk" name="platform/sdk" groups="common" />
-  <project path="system/bluetooth" name="platform/system/bluetooth" groups="common" />
-  <project path="system/netd" name="platform/system/netd" groups="common" />
-  <project path="system/security" name="platform/system/security" groups="common" />
-  <project path="system/vold" name="platform/system/vold" groups="common" />
-  <project path="tools/adt/eclipse" name="platform/tools/adt/eclipse" groups="notdefault,tools" />
-  <project path="tools/adt/idea" name="platform/tools/adt/idea" groups="notdefault,tools" />
-  <project path="tools/base" name="platform/tools/base" groups="notdefault,tools" />
-  <project path="tools/build" name="platform/tools/build" groups="toolsbuild" />
-  <project path="tools/emulator" name="platform/tools/emulator" groups="notdefault,tools" />
-  <project path="tools/external/fat32lib" name="platform/tools/external/fat32lib" groups="tools,common" />
-  <project path="tools/external/gradle" name="platform/tools/external/gradle" groups="notdefault,tools" />
-  <project path="tools/idea" name="platform/tools/idea" groups="notdefault,tools" />
-  <project path="tools/motodev" name="platform/tools/motodev" groups="notdefault,tools" />
-  <project path="tools/swt" name="platform/tools/swt" groups="notdefault,tools" />
+  <project path="hardware/qcom/display" name="platform/hardware/qcom/display" revision="linaro_android_4.3" groups="nexus4" remote="aosp-upstream" />
+  <project path="hardware/qcom/keymaster" name="platform/hardware/qcom/keymaster" groups="nexus4" remote="aosp-upstream" />
+  <project path="hardware/qcom/media" name="platform/hardware/qcom/media" revision="linaro_android_4.3" groups="nexus4" remote="aosp-upstream" />
+  <project path="hardware/qcom/msm8960" name="platform/hardware/qcom/msm8960" groups="qcom_msm8960,nexus4" remote="aosp-upstream" />
+  <project path="hardware/qcom/power" name="platform/hardware/qcom/power" groups="nexus4" remote="aosp-upstream" />
+  <project path="hardware/qcom/sensors" name="platform/hardware/qcom/sensors" groups="nexus4" remote="aosp-upstream" />
+  <project path="hardware/qcom/wlan" name="platform/hardware/qcom/wlan" groups="nexus4" remote="aosp-upstream" />
+  <project path="libnativehelper" name="platform/libnativehelper" groups="common" remote="aosp-upstream" />
+  <project path="ndk" name="platform/ndk" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Bluetooth" name="platform/packages/apps/Bluetooth" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Browser" name="platform/packages/apps/Browser" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Calculator" name="platform/packages/apps/Calculator" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Calendar" name="platform/packages/apps/Calendar" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/ContactsCommon" name="platform/packages/apps/ContactsCommon" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/DeskClock" name="platform/packages/apps/DeskClock" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Dialer" name="platform/packages/apps/Dialer" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Email" name="platform/packages/apps/Email" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Exchange" name="platform/packages/apps/Exchange" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Gallery" name="platform/packages/apps/Gallery" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/KeyChain" name="platform/packages/apps/KeyChain" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Launcher2" name="platform/packages/apps/Launcher2" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Mms" name="platform/packages/apps/Mms" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Music" name="platform/packages/apps/Music" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Nfc" name="platform/packages/apps/Nfc" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/OneTimeInitializer" name="platform/packages/apps/OneTimeInitializer" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/PackageInstaller" name="platform/packages/apps/PackageInstaller" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Phone" name="platform/packages/apps/Phone" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/PhoneCommon" name="platform/packages/apps/PhoneCommon" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Protips" name="platform/packages/apps/Protips" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Provision" name="platform/packages/apps/Provision" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/QuickSearchBox" name="platform/packages/apps/QuickSearchBox" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/SmartCardService" name="platform/packages/apps/SmartCardService" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/SoundRecorder" name="platform/packages/apps/SoundRecorder" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/SpareParts" name="platform/packages/apps/SpareParts" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/SpeechRecorder" name="platform/packages/apps/SpeechRecorder" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Stk" name="platform/packages/apps/Stk" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/Tag" name="platform/packages/apps/Tag" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/VideoEditor" name="platform/packages/apps/VideoEditor" groups="common" remote="aosp-upstream" />
+  <project path="packages/apps/VoiceDialer" name="platform/packages/apps/VoiceDialer" groups="common" remote="aosp-upstream" />
+  <project path="packages/experimental" name="platform/packages/experimental" groups="common" remote="aosp-upstream" />
+  <project path="packages/inputmethods/PinyinIME" name="platform/packages/inputmethods/PinyinIME" groups="common" remote="aosp-upstream" />
+  <project path="packages/providers/ApplicationsProvider" name="platform/packages/providers/ApplicationsProvider" groups="common" remote="aosp-upstream" />
+  <project path="packages/providers/CalendarProvider" name="platform/packages/providers/CalendarProvider" groups="common" remote="aosp-upstream" />
+  <project path="packages/providers/ContactsProvider" name="platform/packages/providers/ContactsProvider" groups="common" remote="aosp-upstream" />
+  <project path="packages/providers/DownloadProvider" name="platform/packages/providers/DownloadProvider" groups="common" remote="aosp-upstream" />
+  <project path="packages/providers/DrmProvider" name="platform/packages/providers/DrmProvider" groups="common" remote="aosp-upstream" />
+  <project path="packages/providers/MediaProvider" name="platform/packages/providers/MediaProvider" groups="common" remote="aosp-upstream" />
+  <project path="packages/providers/PartnerBookmarksProvider" name="platform/packages/providers/PartnerBookmarksProvider" groups="common" remote="aosp-upstream" />
+  <project path="packages/providers/TelephonyProvider" name="platform/packages/providers/TelephonyProvider" groups="common" remote="aosp-upstream" />
+  <project path="packages/providers/UserDictionaryProvider" name="platform/packages/providers/UserDictionaryProvider" groups="common" remote="aosp-upstream" />
+  <project path="packages/screensavers/Basic" name="platform/packages/screensavers/Basic" groups="common" remote="aosp-upstream" />
+  <project path="packages/screensavers/PhotoTable" name="platform/packages/screensavers/PhotoTable" groups="common" remote="aosp-upstream" />
+  <project path="packages/screensavers/WebView" name="platform/packages/screensavers/WebView" groups="common" remote="aosp-upstream" />
+  <project path="packages/wallpapers/Basic" name="platform/packages/wallpapers/Basic" groups="common" remote="aosp-upstream" />
+  <project path="packages/wallpapers/Galaxy4" name="platform/packages/wallpapers/Galaxy4" groups="common" remote="aosp-upstream" />
+  <project path="packages/wallpapers/HoloSpiral" name="platform/packages/wallpapers/HoloSpiral" groups="common" remote="aosp-upstream" />
+  <project path="packages/wallpapers/LivePicker" name="platform/packages/wallpapers/LivePicker" groups="common" remote="aosp-upstream" />
+  <project path="packages/wallpapers/MagicSmoke" name="platform/packages/wallpapers/MagicSmoke" groups="common" remote="aosp-upstream" />
+  <project path="packages/wallpapers/MusicVisualization" name="platform/packages/wallpapers/MusicVisualization" groups="common" remote="aosp-upstream" />
+  <project path="packages/wallpapers/NoiseField" name="platform/packages/wallpapers/NoiseField" groups="common" remote="aosp-upstream" />
+  <project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" groups="common" remote="aosp-upstream" />
+  <project path="pdk" name="platform/pdk" groups="common" remote="aosp-upstream" />
+  <project path="prebuilts/clang/darwin-x86/3.1" name="platform/prebuilts/clang/darwin-x86/3.1" groups="darwin,common" remote="aosp-upstream" />
+  <project path="prebuilts/clang/darwin-x86/3.2" name="platform/prebuilts/clang/darwin-x86/3.2" groups="darwin,common" remote="aosp-upstream" />
+  <project path="prebuilts/clang/linux-x86/3.1" name="platform/prebuilts/clang/linux-x86/3.1" groups="linux,common" remote="aosp-upstream" />
+  <project path="prebuilts/clang/linux-x86/3.2" name="platform/prebuilts/clang/linux-x86/3.2" groups="linux,common" remote="aosp-upstream" />
+  <project path="prebuilts/devtools" name="platform/prebuilts/devtools" groups="common" remote="aosp-upstream" />
+  <project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" groups="common" remote="aosp-upstream" />
+  <project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" groups="notdefault,eclipse" remote="aosp-upstream" />
+  <project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" groups="notdefault,eclipse" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.6" groups="darwin,arm,common" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/darwin-x86/arm/arm-eabi-4.7" name="platform/prebuilts/gcc/darwin-x86/arm/arm-eabi-4.7" groups="common,pdk,darwin,arm" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.6" groups="darwin,arm,common" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.7" name="platform/prebuilts/gcc/darwin-x86/arm/arm-linux-androideabi-4.7" groups="common,pdk,darwin,arm" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/darwin-x86/host/headers" name="platform/prebuilts/gcc/darwin-x86/host/headers" groups="common,pdk,darwin" remote="aosp-upstream" />
+  <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="common,pdk,darwin" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.6" groups="darwin,mips" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.7" name="platform/prebuilts/gcc/darwin-x86/mips/mipsel-linux-android-4.7" groups="pdk,darwin,mips" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.6" groups="darwin,x86,common" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.7" name="platform/prebuilts/gcc/darwin-x86/x86/i686-linux-android-4.7" groups="pdk,darwin,x86,common" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.6" groups="linux,arm,common" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" groups="pdk,linux,arm,common" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.6" groups="linux,arm,common" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" groups="pdk,linux,arm,common" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.4.3" groups="linux,common" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6" groups="linux,common" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" groups="linux,common" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.6" groups="linux,mips" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.7" name="platform/prebuilts/gcc/linux-x86/mips/mipsel-linux-android-4.7" groups="pdk,linux,mips" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.6" groups="linux,x86,common" remote="aosp-upstream" />
+  <project path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7" groups="pdk,linux,x86,common" remote="aosp-upstream" />
+  <project path="prebuilts/misc" name="platform/prebuilts/misc" groups="common" remote="aosp-upstream" />
+  <project path="prebuilts/ndk" name="platform/prebuilts/ndk" groups="common" remote="aosp-upstream" />
+  <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" groups="common" remote="aosp-upstream" />
+  <project path="prebuilts/sdk" name="platform/prebuilts/sdk" groups="common" remote="aosp-upstream" />
+  <project path="prebuilts/tools" name="platform/prebuilts/tools" groups="common,pdk,tools" remote="aosp-upstream" />
+  <project path="sdk" name="platform/sdk" groups="common" remote="aosp-upstream" />
+  <project path="system/bluetooth" name="platform/system/bluetooth" groups="common" remote="aosp-upstream" />
+  <project path="system/netd" name="platform/system/netd" groups="common" remote="aosp-upstream" />
+  <project path="system/security" name="platform/system/security" groups="common" remote="aosp-upstream" />
+  <project path="system/vold" name="platform/system/vold" groups="common" remote="aosp-upstream" />
+  <project path="tools/adt/eclipse" name="platform/tools/adt/eclipse" groups="notdefault,tools" remote="aosp-upstream" />
+  <project path="tools/adt/idea" name="platform/tools/adt/idea" groups="notdefault,tools" remote="aosp-upstream" />
+  <project path="tools/base" name="platform/tools/base" groups="notdefault,tools" remote="aosp-upstream" />
+  <project path="tools/build" name="platform/tools/build" groups="toolsbuild" remote="aosp-upstream" />
+  <project path="tools/emulator" name="platform/tools/emulator" groups="notdefault,tools" remote="aosp-upstream" />
+  <project path="tools/external/fat32lib" name="platform/tools/external/fat32lib" groups="tools,common" remote="aosp-upstream" />
+  <project path="tools/external/gradle" name="platform/tools/external/gradle" groups="notdefault,tools" remote="aosp-upstream" />
+  <project path="tools/idea" name="platform/tools/idea" groups="notdefault,tools" remote="aosp-upstream" />
+  <project path="tools/motodev" name="platform/tools/motodev" groups="notdefault,tools" remote="aosp-upstream" />
+  <project path="tools/swt" name="platform/tools/swt" groups="notdefault,tools" remote="aosp-upstream" />
 </manifest>