Revert of Updated the omnibox on Android to color URLs correctly

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

Index: chrome/android/java/res/values/colors.xml
diff --git a/chrome/android/java/res/values/colors.xml b/chrome/android/java/res/values/colors.xml
index ecc64e3f36f1d0d9b99a29216c1c24c4231a232b..8c572993067105ae85ef4f3968f12eb6afbbe297 100644
--- a/chrome/android/java/res/values/colors.xml
+++ b/chrome/android/java/res/values/colors.xml
@@ -47,15 +47,12 @@
     <color name="url_emphasis_start_scheme_security_error">#db4437</color>
     <color name="url_emphasis_start_scheme_ev_secure">#1ac222</color>
     <color name="url_emphasis_start_scheme_secure">#1ac222</color>
-    <color name="url_emphasis_non_emphasized_text">#80333333</color>
-    <color name="url_emphasis_light_non_emphasized_text">#80ffffff</color>
+    <color name="url_emphasis_scheme_to_domain">#969696</color>
+    <color name="url_emphasis_trailing_url">#969696</color>
     <color name="url_emphasis_domain_and_registry">#333333</color>
     <color name="url_emphasis_light_domain_and_registry">#ffffff</color>
     <color name="url_emphasis_default_text">#333333</color>
     <color name="url_emphasis_light_default_text">#ffffff</color>
-    <!-- TODO(sashab): Remove (for backwards compatibility only). -->
-    <color name="url_emphasis_scheme_to_domain">#969696</color>
-    <color name="url_emphasis_trailing_url">#969696</color>
 
     <!--  Distilled Page Prefs colors -->
     <color name="distilled_page_prefs_selected">#999999</color>