[Android] Add an out-of-app instrumentation driver APK. (RELAND)

android_webview/android_webview_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': 'android_webview_apk',
       'type': 'none',
       'dependencies': [
         'libstandalonelibwebviewchromium',
@@ skipping 76 matching lines @@
       ],
       'includes': [ '../build/apk_fake_jar.gypi' ],
     },
     {
       'target_name': 'android_webview_test_apk',
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:base_java_test_support',
         '../content/content_shell_and_tests.gyp:content_java_test_support',
         '../net/net.gyp:net_java_test_support',
+        '../testing/android/on_device_instrumentation.gyp:broker_java',
+        '../testing/android/on_device_instrumentation.gyp:require_driver_apk',
         'android_webview_apk_java',
       ],
       'variables': {
         'apk_name': 'AndroidWebViewTest',
         'java_in_dir': '../android_webview/javatests',
         'is_test_apk': 1,
       },
       'includes': [ '../build/java_apk.gypi' ],
     },
     {
@@ skipping 101 matching lines @@
       ],
     },
     {
       'target_name': 'libstandalonelibwebviewchromium',
       'includes': [
         'libwebviewchromium.gypi',
       ],
     },
   ],
 }