am 73258630: Merge "jni: binder 64-bit compile issues"

* commit '7325863013e5c34d493e4e92ecadf4fea87554e7':
  jni: binder 64-bit compile issues