Update windows and android for new cocos2d-x changes