Merge "Fix building static host executables."