Merge "jni: 64-bit compile issue"