Curl Updated
Android build fix
Merge branch 'curl-update' into master-4enjoy