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

* commit '6466f400a40224dc113eb6d06009a1c655151045':
  Fix incorrect prototype for JNI call