Reland (2x) r230314, "Fix codegen for virtual methods that are (re-) exported from multiple modules."

This reverts commits r230477 and r230478.

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