patch and bytecode test fixes

android/java/proguard.flags

@@ -10,24 +10,26 @@
 }
 
 -keep class org.chromium.components.browser_ui.site_settings.ContentSettingsResources {
-    private static *** getResourceItem(...);
+    *** getResourceItem(...);
 }
 
 -keep class org.chromium.components.browser_ui.site_settings.SingleCategorySettings {
-    private *** getAddExceptionDialogMessage();
-    private void resetList();
+    *** mCategory;
+    *** getAddExceptionDialogMessage(...);
+    *** resetList(...);
 }
 
 -keep class org.chromium.components.browser_ui.site_settings.SingleWebsiteSettings {
-    private static *** getPreferenceKey(...);
-    private void setupContentSettingsPreferences();
-    private void setupContentSettingsPreference(...);
+    *** mSite;
+    *** getPreferenceKey(...);
+    *** setupContentSettingsPreferences(...);
+    *** setupContentSettingsPreference(...);
 }
 
 -keep class org.chromium.components.browser_ui.site_settings.Website {
-    public *** getPermissionInfo(...);
-    public *** getContentSettingException(...);
-    public *** getAddress();
-    public void setContentSettingException(...);
-    public void setContentSetting(...);
+    *** getPermissionInfo(...);
+    *** getContentSettingException(...);
+    *** getAddress(...);
+    *** setContentSettingException(...);
+    *** setContentSetting(...);
 }