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

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