Fix:Resolve the android template projects’s errors
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
Fix:Update cocos_files.json file
Merge pull request #4960 from samuele3hu/developNewUI

Fix:Resolve the android template projects’s errors