am 850e0b3a: am edab98a4: Merge "Catch more cases of static host executables."

* commit '850e0b3affe8a1b047eeb136bf104ed8759f8dad':
  Catch more cases of static host executables.