Move ChromeShell files from chrome/android/testshell to chrome/android/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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 2963 matching lines @@
             'chrome_java',
             'chromium_testshell_java',
             'chrome_java_test_support',
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
             '../content/content_shell_and_tests.gyp:content_java_test_support',
             '../sync/sync.gyp:sync_javatests',
           ],
           'variables': {
             'apk_name': 'ChromiumTestShellTest',
-            'java_in_dir': 'android/testshell/javatests',
+            'java_in_dir': 'android/shell/javatests',
             'resource_dir': 'android/shell/res',
             'additional_src_dirs': ['android/javatests/src'],
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
           'target_name': 'chromedriver_webview_shell_apk',
           'type': 'none',
           'variables': {
@@ skipping 218 matching lines @@
             'utility',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
           ],
         }]
     }],
   ],  # 'conditions'
 }