Code cleanup and fix iOS build.
[ci package]
For Travis CI - switch CI build to use Android build environment.