am 7d755a6f: Merge branch \'klp-modular-dev-plus-aosp\' of...

am 7d755a6f: Merge branch \'klp-modular-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp

* commit '7d755a6f':
  jni: binder ptrdiff_t compile issues