closed #2330, Support more ABI types in plugin.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #3086 from natural-law/develop

Support more ABI types in plugin.