android and linux
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3