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

* commit '4037847c0251a15ea88012a8405d0688c8b1ac53':
  jni: binder 64-bit compile issues

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base