update android-build.py for copying files about lua
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket

Conflicts:
	build/android-build.py
fix error that “lua-test/opengltest/shader retro effect” test case have no effect
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
Merge pull request #6111 from samuele3hu/develop_socket

fix error that “lua-test/opengltest/shader retro effect” test case have no effect