am cec783df: Merge "More consistent JNI error reporting."

* commit 'cec783df5a51233dab94f2fa4506f677d45132e8':
  More consistent JNI error reporting.