Merge pull request #6886 from samuele3hu/v3_fix

fix some bugs for lua-tests
Roll back test_image_ar.pvr
Merge pull request #6891 from boyu0/3.1_test

Roll back test_image_ar.pvr
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix