Move v17 styles to base values resource directory

With the deprecation of Jelly Bean the
generate_v14_compatible_resources.py script has now been removed
(https://crrev.com/c/1651934), so these styles no longer need to be
placed in a version-specific resource directory.

The WebNotification text color is extracted here to color resources to
resolve a presubmit error.

Bug: 923477
Change-Id: Ifc7a14275138c11a0010974b373b900e2b7cab69
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1776861Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692101}

chrome/android/java/res/values/colors.xml

@@ -189,5 +189,6 @@
     <color name="thumbnail_placeholder_on_primary_bg" tools:ignore="UnusedResources">@color/modern_secondary_color</color>
     <color name="tab_layout_selected_tab_color">@color/default_text_color_blue</color>
     <color name="drag_handlebar_color">#D9DBDF</color>
+    <color name="web_notification_text">#CCCCCC</color>
 
 </resources>

chrome/android/java/res/values-v17/styles.xml → chrome/android/java/res/values/styles.xml

@@ -4,18 +4,6 @@
      found in the LICENSE file. -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Q: Why put style resources under values-v17/ ?
-         A: Problem:
-            1. paddingStart causes a crash on Galaxy Tab&Note b/8351339.
-            2. So we wrote a build script(generate_v14_compatible_resources.py) to convert
-               paddingStart to paddingLeft for pre-v17 (crbug.com/235118).
-            3. However, style files are not overridden by the corresponding generated style files,
-               but merged when we pass them to aapt unlike layout files.
-
-            So we decided to keep style resources under values-v17/ so that it is not merged with
-            the generated style resources under res_v14_compatibility/values/ (crbug.com/243952).
-    -->
-
     <!-- TODO(huayinz): Move themes to another xml file. -->
     <!-- Application themes -->
     <style name="LauncherTheme" parent="@android:style/Theme.NoDisplay" />
@@ -553,7 +541,7 @@
     <style name="TextAppearance.WebNotificationButton"
         parent="android:TextAppearance.DeviceDefault.Widget.Button">
         <!-- textColor from the 4.4.4 notification_action.xml - no public aliases. -->
-        <item name="android:textColor">#ccc</item>
+        <item name="android:textColor">@color/web_notification_text</item>
     </style>
     <style name="WebNotificationSettingsButton"
         parent="@style/WebNotificationButton">