am 021cf13e: am 7782c6b3: Merge "Fix JNI error in exception reporting."

* commit '021cf13e7abfb2fcf1bddf957d23ef1eda2ca191':
  Fix JNI error in exception reporting.