Cleanup builders on interruption when called directly

Ensures builder is cleaned up if there's an interruption or failure in any of the methods, e.g. an rpmbuild failure.