Looks like the remaining failure is somewhere in swift/lib/ClangImporter/ClangImporter.cpp and unrelated to my changes.

-- adrian