Merge "jni: binder ptrdiff_t compile issues"