am 94451789: am cfafe554: Merge "Fix building static host executables."

* commit '94451789f4ec9d0ea884c0af4856aa846bc71d2e':
  Fix building static host executables.