Update more stuff to cocos2d-x 2.2