Merge "Fix host-run-test-jar to be legal for /bin/sh"