Upgrade cocos2d-x to 2.2.1: refs #2228

fix label geometry