Merge pull request #5748 from samuele3hu/master_armature

Remove `Werror` from compile file for linux
Remove `Werror` from compile file for nacl
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_armature