am 81d38f74: Merge "Use the current Java stack instead of the ThrowLocation."

* commit '81d38f74219774d87389f83f23595ffc8fe814b1':
  Use the current Java stack instead of the ThrowLocation.