swift234

[ClangImporter] Add some more tests for mixing methods and properties.

The rule right now is basically "the class is most important, followed by
the superclass, followed by protocols", which I think is the right rule.
As long as we aren't required to /check/ the conformance to an Objective-C
protocol, we should be fine.

Swift SVN r16036