Merge pull request #6979 from visiblelight/TextureOptimize

Texture Optimize
[ci skip]
Update control.lua for lua-tests
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
Merge pull request #6987 from samuele3hu/v3_fix

Update control.lua for lua-tests