Merge "Add additional clean targets"