Revert r144300 "llvm-config: Replace with C++ version (was llvm-config-2).",