Revert commit 145449 (ddunbar) since it is breaking the dragonegg buildbots.

Original commit message:
llvm-config: Replace with C++ version (was llvm-config-2).
 - Reapply of r144300, with lots of fixes/migration easement in between.

llvm-svn: 145582