ConscryptMiddleware fixes:

Do not overwrite non default SSLContexts.
Add a non-racy way to create a Conscrypt SSLContext.

Conflicts:
	ion/src/com/koushikdutta/ion/Ion.java
	ion/src/com/koushikdutta/ion/conscrypt/ConscryptMiddleware.java
junk file
Merge pull request #343 from robUx4/resize_exception

throw a custom Exception when the size set for resize are incorrect, rat...
Revert "Sometimes I need some extra data in my AsyncHttpRequestFactory to know what was the source object and to set stuff in it. Factories should have a cookie for such cases."

This reverts commit 5cc4d0175bf5fa92e76670c34088652cf320d2a4.
Merge remote-tracking branch 'remotes/koush/master' into plume
Revert "do not force the size the placeholder and error drawables"

This reverts commit 37a20ff8f0b7fa332dc2bafa45093d3228a150be.