[Android] Remove org.apache.http from proguard flags and gn.

testing/android/proguard_for_test.flags

Index: testing/android/proguard_for_test.flags
diff --git a/testing/android/proguard_for_test.flags b/testing/android/proguard_for_test.flags
index 51f1428772d9effee7f7155da3273000b19ee666..45895d09233b800064c5cd567323fe1ff9708e69 100644
--- a/testing/android/proguard_for_test.flags
+++ b/testing/android/proguard_for_test.flags
@@ -23,17 +23,6 @@
     *;
 }
 
-# TODO(yfriedman): Remove when crbug.com/488192 is fixed.
--dontwarn org.apache.http.conn.scheme.LayeredSocketFactory
-
 # We have some "library class WebView depends on program class SslCertificate"
 # warnings, and they don't affect us.
 -dontwarn android.webkit.WebView*
-
-# We don't want BasicHttpParams or AbstractHttpParams to get renamed since that
-# then makes our calls to them use the implementation that we find in our .dex
-# file, which is broken. We need to rely on these calls resolving to the
-# system's implementation. See crbug.com/488192#c36.
--keepnames class org.apache.** {
-  *;
-}