am 472512f6: Merge "Fix incorrect prototype for JNI call"

* commit '472512f6970fa170e2e1a3e1c24ac2b742e2e6b6':
  Fix incorrect prototype for JNI call