Merge branch 'java-style' of https://github.com/minggo/cocos2d-x into v3-game
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-game
Fixed content size of Label is incorrect after sets empty string.
Merge pull request #9495 from vovkasm/pull/fix-tinyxml-usage

Fix usage of tinyxml2 in cocostudio code
Merge pull request #9497 from Dhilan007/v3-game

Fixed content size of Label is incorrect after sets empty string.