Fix vbtable indices when a class shares the vbptr with a non-virtual base

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