add --force-rm to clean up after a failed build Upstream-commit: db1a3551a34e054ee687545ab4922114d13d29d0 Component: engine