am ea093986: am ec97825f: Merge "Fix proxy handling in FindDeclaredVirtualMethod"

* commit 'ea093986219743556b058fcac86ab565e1354821':
  Fix proxy handling in FindDeclaredVirtualMethod