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
Android crash fix on new devices
[ci skip]
update android-build.py for copying files about lua
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
Fixed copying resource fails in empty-lua-test.
Merge pull request #6099 from dumganhar/develop

Fixed copying resource fails in empty-lua-test.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket

Conflicts:
	build/android-build.py
[ci skip]auto detect android device ip via adb command
[ci skip]fix typo
performance fixes in QuadCommand
Merge pull request #6102 from ricardoquesada/quadcommand_perf_fixes

performance fixes in QuadCommand
Merge pull request #6100 from heliclei/fix-autotest

Auto detect android device ip via adb command
init version of math
remove base dependence, add ccMacros.h
iOS can compile now
closed #4584, Add feature to force update the environment variables in setup.py.
Merge branch 'develop' into issue4584
closed #4635: ControlSwitch's marksprite is shown at a wrong place