Remove non-llvm patch parts; fix paths