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

* commit 'cfafe554c0852f5b2c05e5d895b47d032daeec2e':
  Fix building static host executables.