Merge changes from Android/CMake upstream repo to support NDK r10d.
For Travis CI - switch CI build to use OS X build environment.