closed #4659:Remove the usage of OpenSL
Update CHANGELOG [ci skip]
Merge pull request #6187 from Dhilan007/develop_activity

closed #4659:Remove the usage of OpenSL
Updates bindings-generator to the latest version.
Merge pull request #6190 from dumganhar/develop

Updates bindings-generator to the latest version.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop

Conflicts:
	tools/bindings-generator
[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #6191 from CocosRobot/update_cocosfiles_1397030339

[AUTO][ci skip]: updating cocos2dx_files.json
compile fix
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop