Try harder to ensure a strict weak ordering of overload candidates that
have arity mismatches.

git-svn-id: http://llvm.org/svn/llvm-project/cfe/trunk@208146 91177308-0d34-0410-b5e6-96231b3b80d8