am d5ddf40e: Merge "Fix host tests that need the shell."

* commit 'd5ddf40ecf72a03e38164389555ccdade779ab5a':
  Fix host tests that need the shell.