fix build error caused by libcurl on android x86
Merge https://github.com/cocos2d/cocos2d-x into test-before-release
Merge https://github.com/cocos2d/cocos2d-x into test-before-release
remove unsupported parameter in android
Merge pull request #2217 from minggo/test-before-release

fix build error caused by libcurl on android x86