Further fixes around Conscrypt setting defaults like crazy..

Conflicts:
	ion/test/src/com/koushikdutta/ion/test/ConscryptTests.java