Fix for android and ios hosts built with custom host.
merge with master for CI on osx