[WebView] Reorganize all of the WebView Shell apks into their own dir.

android_webview/android_webview_shell.gyp

Index: android_webview/android_webview_shell.gyp
diff --git a/android_webview/android_webview_shell.gyp b/android_webview/android_webview_shell.gyp
index 0af0dbea239f42ed81b6adc4c5a94366f6ba95be..1b6d87e5ba5c14e3d3b69e5050734acebd8fd267 100644
--- a/android_webview/android_webview_shell.gyp
+++ b/android_webview/android_webview_shell.gyp
@@ -9,9 +9,9 @@
       'type': 'none',
       'variables': {
         'apk_name': 'SystemWebViewShell',
-        'java_in_dir': 'tools/WebViewShell',
-        'resource_dir': 'tools/WebViewShell/res',
-        'android_manifest_path': 'tools/WebViewShell/AndroidManifest.xml', # for lint
+        'java_in_dir': 'tools/webview_shell/WebViewShell',
+        'resource_dir': 'tools/webview_shell/WebViewShell/res',
+        'android_manifest_path': 'tools/webview_shell/WebViewShell/AndroidManifest.xml', # for lint
       },
       'includes': [
         '../build/java_apk.gypi',
@@ -41,10 +41,10 @@
       ],
       'variables': {
         'apk_name': 'SystemWebViewShellPageCycler',
-        'java_in_dir': '../android_webview/tools/PageCycler',
+        'java_in_dir': '../android_webview/tools/webview_shell/PageCycler',
         'is_test_apk': 1,
         'test_type': 'instrumentation',
-        'android_manifest_path': '../android_webview/tools/PageCycler/AndroidManifest.xml',
+        'android_manifest_path': '../android_webview/tools/webview_shell/PageCycler/AndroidManifest.xml',
       },
       'includes': [
         '../build/java_apk.gypi',
@@ -63,11 +63,11 @@
       ],
       'variables': {
         'apk_name': 'SystemWebViewShellLayoutTest',
-        'java_in_dir': '../android_webview/tools/WebViewShellTest',
+        'java_in_dir': '../android_webview/tools/webview_shell/LayoutTests',
         'is_test_apk': 1,
         'test_type': 'instrumentation',
         'isolate_file': 'system_webview_shell_test_apk.isolate',
-        'android_manifest_path': '../android_webview/tools/WebViewShellTest/AndroidManifest.xml',
+        'android_manifest_path': '../android_webview/tools/webview_shell/LayoutTests/AndroidManifest.xml',
       },
       'includes': [
         '../build/java_apk.gypi',