manifest: pull some more stuff from upstream

Missed a few projects earlier because they weren't in the
unpatched AOSP section

Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
diff --git a/default.xml b/default.xml
index 2824842..b09ad34 100644
--- a/default.xml
+++ b/default.xml
@@ -184,10 +184,6 @@
   <project path="external/tremolo" name="platform/external/tremolo" groups="common" />
   <!-- Linaro modifications: Add ECM -->
   <project path="packages/apps/Settings" name="platform/packages/apps/Settings" revision="linaro_android_4.3" groups="common" />
-  <project path="cts" name="platform/cts" groups="common" />
-  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" groups="common" />
-  <project path="system/media" name="platform/system/media" groups="common" />
-  <project path="external/strace" name="platform/external/strace" groups="common" />
   <!-- Linaro modifications: ISO C++ 11 support -->
   <project path="packages/apps/Camera" name="platform/packages/apps/Camera" revision="linaro_android_4.3" groups="common" />
   <project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" revision="linaro_android_4.3" groups="common" />
@@ -209,6 +205,10 @@
   <project path="device/ti/uim" name="device/ti/uim" revision="android" groups="common" />
 
   <!-- AOSP -->
+  <project path="cts" name="platform/cts" groups="common" remote="aosp-upstream" />
+  <project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" groups="common" remote="aosp-upstream" />
+  <project path="system/media" name="platform/system/media" groups="common" remote="aosp-upstream" />
+  <project path="external/strace" name="platform/external/strace" groups="common" remote="aosp-upstream" />
   <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" />