Revert of Site Settings Android: A few polish items.

chrome/android/java/res/xml/site_settings_preferences.xml

Index: chrome/android/java/res/xml/site_settings_preferences.xml
diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/android/java/res/xml/site_settings_preferences.xml
index 96d9142ca496820295c39ccfcdad3391823f540b..b6ad942ef3b8446d45f83ebe68ebd48280e00290 100644
--- a/chrome/android/java/res/xml/site_settings_preferences.xml
+++ b/chrome/android/java/res/xml/site_settings_preferences.xml
@@ -7,64 +7,64 @@
      you are not sure where to add your item, add it above Storage. -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- All sites -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <Preference
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
         android:key="all_sites"
         android:title="@string/all_sites"
         android:icon="@drawable/settings_all_sites" />
     <!-- Cookies -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <Preference
         android:key="cookies"
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences" />
     <!-- Location -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <Preference
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
         android:key="device_location" />
     <!-- Camera -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <Preference
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
         android:key="camera" />
     <!-- Microphone -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <Preference
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
         android:key="microphone" />
     <!-- JavaScript -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <Preference
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
         android:key="javascript" />
     <!-- Popups -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <Preference
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
         android:key="popups" />
     <!-- Fullscreen -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <Preference
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
         android:key="fullscreen" />
     <!-- Notifications -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <Preference
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
         android:key="notifications" />
     <!-- Autoplay -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <Preference
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
         android:key="autoplay" />
     <!-- Protected content -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <Preference
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
         android:key="protected_content" />
     <!-- Background sync -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <Preference
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
         android:key="background_sync" />
     <!-- Language -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <Preference
         android:fragment="org.chromium.chrome.browser.preferences.website.LanguagePreferences"
         android:key="language"
         android:title="@string/language"
         android:icon="@drawable/settings_language" />
     <!-- Storage -->
     <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <Preference
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
         android:key="use_storage"
         android:title="@string/website_settings_storage"