manifest: Pull guavac from AOSP

Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
diff --git a/default.xml b/default.xml
index b09ad34..d5652ab 100644
--- a/default.xml
+++ b/default.xml
@@ -144,8 +144,6 @@
   <project path="external/jpeg" name="people/tomgall/libjpeg-turbo/libjpeg-turbo" revision="android" remote="linaro-other" groups="common" />
   <!-- Linaro modifications: Fix the float ABI check for gcc 4.7+ -->
   <project path="external/v8" name="platform/external/v8" revision="linaro_android_4.3" groups="common" />
-  <!-- Linaro modifications: Make it build with OpenJDK" -->
-  <project path="external/guava" name="platform/external/guava" groups="common" />
   <!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
   <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.3" groups="common" />
   <project path="device/samsung/maguro" name="device/samsung/maguro" revision="linaro_android_4.3" groups="common" />
@@ -210,6 +208,7 @@
   <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="external/guava" name="platform/external/guava" 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" />