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

* commit 'eaf2617fc20dd6484722edc9df41faf6e91d73cc':
  Fix incorrect prototype for JNI call