Merge "Fix braino when resolving an invoke-super." am: d48015603a
am: 0fc16a2702

* commit '0fc16a2702bc5193fb61320be79f513cf0c64838':
  Fix braino when resolving an invoke-super.