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

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

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build