Merge pull request #7936 from jrose-apple/3.1-undeserved-assertions-for-erroneous-errors

[ClangImporter] Don't crash when a bad override affects NSErrors.