Minor code cleanup.
For Travis CI - switch CI build to use Android build environment.