Fix:Resolve the lua android template errors
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI

Conflicts:
	tools/project-creator/module/cocos_files.json
Fix:Regeneration cocos_files.json
Merge pull request #4929 from samuele3hu/developNewUI

Fix:Resolve the lua android template errors