Revert "Merge branch 'gles20' of github.com:brooklynpacket/cocos2d-x into gles20"

This reverts commit e843797eb66f1d58d1e6890b41ce635faed8e4e9, reversing
changes made to c83a516b5fdeede17a35a2382adb000bee557d99.