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

* commit '619c52124b2b34571695deebe8f5e9d86949aea2':
  Fix building static host executables.