This should fix the clang part of the breakage in r200340. llvm-svn: 200435
Remove one outdated test. llvm-svn: 138144