Merge https://github.com/dumganhar/cocos2d-x into test-damganhar
fix some bugs when creating android project with multi-platform tool
Merge pull request #2232 from minggo/test-damganhar

fix some bugs when creating android project