Move ui and content resources into one location.

android_webview/android_webview.gyp

Index: android_webview/android_webview.gyp
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 2d7c31fd64a6c1de1896b2c56b38aa5c53e1c3c3..5052ad05f014af2661c13f551141a972a7fdf4fd 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -266,12 +266,34 @@
      }, { # android_webview_build==1
       'targets': [
         {
-          'target_name': 'android_webview_strings',
+          'target_name': 'android_webview_jarjar_ui_resources',
+          'android_unmangled_name': 1,
+          'type': 'none',
+          'variables': {
+            'res_dir': '../ui/android/java/res',
+            'rules_file': '../android_webview/build/jarjar-rules.txt',
+          },
+          'includes': ['../android_webview/build/jarjar_resources.gypi'],
+        },
+        {
+          'target_name': 'android_webview_jarjar_content_resources',
+          'android_unmangled_name': 1,
+          'type': 'none',
+          'variables': {
+            'res_dir': '../content/public/android/java/res',
+            'rules_file': '../android_webview/build/jarjar-rules.txt',
+          },
+          'includes': ['../android_webview/build/jarjar_resources.gypi'],
+        },
+        {
+          'target_name': 'android_webview_resources',
           'type': 'none',
           'android_unmangled_name': 1,
           'dependencies': [
             '../content/content.gyp:content_strings_grd',
             '../ui/android/ui_android.gyp:ui_strings_grd',
+            'android_webview_jarjar_ui_resources',
+            'android_webview_jarjar_content_resources'
           ],
         },
       ],