mclow.lists added a comment. The patch (again) doesn't apply cleanly (test/CMakeLists.txt), so I applied it manually. After that, it builds w/o errors, and passes all the tests. After addressing @EricWF's concerns, I think this is ready to land. https://reviews.llvm.org/D21968