Merge "Add support for non-virtual thunk."