Reverted previous fix to is_convertible as it caused more problems than it...

Reverted previous fix to is_convertible as it caused more problems than it fixed.  But this reverted fix will only matter for non-clang compilers.  Installed __is_convertible_to for clang.

llvm-svn: 124429