am da93c60d: Merge "jni: binder ptrdiff_t compile issues"

* commit 'da93c60d8a5b79f90d44408d992fb532eaaf8fa7':
  jni: binder ptrdiff_t compile issues