Merge pull request #1 from bigfatbrowncat/master

Conscrypt fix for the new Android and Windows