Fix Android amalgamated build.
Merge branch 'amalgamated'. Fix Android amalgamated build.
For Travis CI - switch CI build to use OS X build environment.