Fix build for host toolchains

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>
Merge remote-tracking branch 'sm/master' into master