Fix the build following cocos2d-x c++ lib upgrade
Merge branch 'develop' of https://github.com/cocos2d-x/plugin-x into develop