twister: improve handling of artifacts with --prep-artifacts-for-testing

Previous commit dealing with cleanup (c304db56) was not taking
--prep-artifacts-for-testing into consideration. Fix this and make sure
we do cleanup when this option is enabled.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>