am ec97825f: Merge "Fix proxy handling in FindDeclaredVirtualMethod"

* commit 'ec97825f8553b3a99b6dfbbb90a50fe65301ea94':
  Fix proxy handling in FindDeclaredVirtualMethod