Update CHANGELOG [ci skip]
fix autotest infinite loop
Merge pull request #6092 from heliclei/fix-autotest

Fix autotest infinite loop
Merge pull request #6094 from dumganhar/develop

Updates templates for linux platform
update android-build.py for copying files about lua
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
Merge pull request #6095 from samuele3hu/develop_socket

update android-build.py for copying files about lua