Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
issue #5281: fix AndroidManifest.xml format error
Merge pull request #404 from joshuastray/master

issue #5281: fix AndroidManifest.xml format error