Merge "Fix proxy handling in FindDeclaredVirtualMethod"