Add guava and jsr-305 to third_party for Android

third_party/cacheinvalidation/cacheinvalidation.gyp

Index: third_party/cacheinvalidation/cacheinvalidation.gyp
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index 84aeb96e8b7463a96295f35b0a80ac9a2cb6392d..c722dc57e680329b54201c16560d912aba458dea 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -195,8 +195,8 @@
           'type': 'none',
           'dependencies': [
             '../../third_party/android_tools/android_tools.gyp:android_gcm',
+            '../../third_party/guava/guava.gyp:guava_javalib',
             'cacheinvalidation_aidl_javalib',
-            'cacheinvalidation_guava_javalib',
             'cacheinvalidation_proto_java',
           ],
           'variables': {
@@ -221,18 +221,6 @@
           ],
           'includes': [ '../../build/java_aidl.gypi' ],
         },
-        # TODO(nyquist): Depend on guava from third_party/guava. See http://crbug.com/159873.
-        {
-          'target_name': 'cacheinvalidation_guava_javalib',
-          'type' : 'none',
-          'all_dependent_settings': {
-            'variables': {
-              'input_jars_paths' : [
-                'src/example-app-build/libs/guava-13.0.1.jar',
-              ],
-            }
-          }
-        },
       ],
     }],
   ],