am 2e21be13: Merge "Fix host-run-test-jar to be legal for /bin/sh"

* commit '2e21be131922fa55509603c54a5859e87000c256':
  Fix host-run-test-jar to be legal for /bin/sh