This reverts commit r259126 and relands r259117. This time with updated library dependencies. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@259130 91177308-0d34-0410-b5e6-96231b3b80d8