am e715cadd: Merge change 5634 into donut

Merge commit 'e715cadd4115c2e6a97745aa6d808d9a24271a3f'

* commit 'e715cadd4115c2e6a97745aa6d808d9a24271a3f':
  Fix build/host-setup.sh to run as a Bourne shell script and add better host detection: