minor changes for cocos builder integration
Merge remote-tracking branch 'upstream/master'