Merge "jni: binder 64-bit compile issues"