Merge branch 'ccx_filesystem' of https://github.com/folecr/cocos2d-x into ccx_filesystem
issue #2329:fixed a compiling error of AssetsManager on Android
Merge pull request #2990 from minggo/ccx_filesystem

fixed a compiling error of AssetsManager on Android