cocos2dx some fix
Merge branch '2.1.4' of github.com:Zentertain/cocos2d-x into 2.1.4
enable CC_ENABLE_CACHE_TEXTURE_DATA in android