Add guava and jsr-305 to third_party for Android

third_party/cacheinvalidation/cacheinvalidation.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # This library should build cleanly with the extra warnings turned on
     # for Chromium.
     'chromium_code': 1,
   },
@@ skipping 177 matching lines @@
             '<(proto_in_dir)/java_client.proto',
             '<(proto_in_dir)/types.proto',
           ],
           'includes': [ '../../build/protoc_java.gypi' ],
         },
         {
           'target_name': 'cacheinvalidation_javalib',
           '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': {
             'package_name': '<(_target_name)',
             'java_in_dir': '../../build/android/empty',
             'additional_src_dirs': [ 'src/java/' ],
           },
           'includes': [ '../../build/java.gypi' ],
         },
         {
           'target_name': 'cacheinvalidation_aidl_javalib',
           'type': 'none',
           'variables': {
             'package_name': '<(_target_name)',
             # TODO(shashishekhar): aidl_interface_file should be made optional.
             'aidl_interface_file':'<(android_sdk)/framework.aidl'
           },
           'sources': [
             'src/java/com/google/ipc/invalidation/external/client/android/service/InvalidationService.aidl',
             'src/java/com/google/ipc/invalidation/external/client/android/service/ListenerService.aidl',
             'src/java/com/google/ipc/invalidation/testing/android/InvalidationTest.aidl',
           ],
           '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',
-              ],
-            }
-          }
-        },
       ],
     }],
   ],
 }