builder: fix layer lifecycle leak Upstream-commit: 600475715eb93fa402d1642a3586421c7182d63b Component: engine