am ebee8de7: Fix bugs in the x86 and arm versions of generic JNI.

* commit 'ebee8de725d5fa83483642786b19ea453d865762':
  Fix bugs in the x86 and arm versions of generic JNI.