Update bundlescripts to use "set -e" consistently Upstream-commit: 28e7e814795fce2a75e4767a6707a6e4d03fa8b6 Component: engine