Merge pull request #2120 from dumganhar/master

fixed #1811: Fixing complication error on win32 after this pull request (https://github.com/cocos2d/cocos2d-x/pull/2119
fixed #1812: A warning of getStringWithEllipsisJni function when compiling it with clang.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x