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

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