Merge "Clean jack intermediates"