Merge "Don't repack the llvm/clang static libraries into libslang"