Updated build for Android
Merge branch 'gamechefs-base64' of github.com:gamechefs/cocos2d-x into gamechefs-base64