Upstream the android python scripts changes that enable the new Forwarder2 to be used in our test f…

content/content_tests.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 889 matching lines @@
           'dependencies': [
             'content_java',
             'content_java_test_support',
             'content_shell_java',
             '../base/base.gyp:base_java',
             '../base/base.gyp:base_java_test_support',
             '../media/media.gyp:media_java',
             '../media/media.gyp:media_test_support',
             '../net/net.gyp:net_java',
             '../net/net.gyp:net_javatests',
-            '../tools/android/forwarder/forwarder.gyp:forwarder',
+            '../tools/android/forwarder2/forwarder.gyp:forwarder2',
           ],
           'variables': {
             'package_name': 'content_shell_test',
             'apk_name': 'ContentShellTest',
             'java_in_dir': '../content/shell/android/javatests',
             'resource_dir': '../res',
             'additional_src_dirs': ['../content/public/android/javatests/'],
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],
   ],
 }