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

* commit 'dc500d2d567b37c620308bc8f0b0928eba4a2f5b':
  jni: binder 64-bit compile issues