Rename chrome/android/javatests to javatests_shell.

chrome/chrome_tests.gypi

 # Copyright 2013 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': {
     'chrome_browser_extensions_test_support_sources': [
       # A list of sources which is shared between different browser tests.
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',
       'browser/extensions/browsertest_util.cc',
@@ skipping 2941 matching lines @@
             '../components/components.gyp:precache_javatests',
             '../content/content_shell_and_tests.gyp:content_java_test_support',
             '../sync/sync.gyp:sync_javatests',
             '../testing/android/on_device_instrumentation.gyp:broker_java',
             '../testing/android/on_device_instrumentation.gyp:require_driver_apk',
             '../ui/android/ui_android.gyp:ui_javatests',
           ],
           'variables': {
             'apk_name': 'ChromeShellTest',
             'java_in_dir': 'android/shell/javatests',
-            'additional_src_dirs': ['android/javatests/src'],
+            'additional_src_dirs': ['android/javatests_shell/src'],
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
           # GN: //chrome/android:chrome_junit_tests
           'target_name': 'chrome_junit_tests',
           'type': 'none',
           'dependencies': [
             'chrome_java',
@@ skipping 283 matching lines @@
             ['enable_webrtc==1', {
               'dependencies': [
                 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
               ]
             }],
           ],
         }]
     }],
   ],  # 'conditions'
 }