141
Fix ConscryptMiddleware clobbering SSLContext that use self signed certs.

Conflicts:
	ion/src/com/koushikdutta/ion/conscrypt/ConscryptMiddleware.java
Merge remote-tracking branch 'remotes/koush/1.x' into plume

Conflicts:
	ion/AndroidManifest.xml
If GMS is installed we still need to make sure it will be used by AsyncSSLSocketMiddleware
Cleaner way to invoke the Conscrypt installation using a public method from the GMS
Merge remote-tracking branch 'remotes/origin/clean_conscrypt_invocation' into plume
Merge remote-tracking branch 'remotes/origin/use_default_gms_conscrypt' into plume
Cleaner way to invoke the Conscrypt installation using a public method from the GMS
Merge remote-tracking branch 'remotes/origin/clean_conscrypt_invocation' into plume
use the latest Async library