Merge "Fix binder_to_string.h for NDK" am: 66f9970444 am: 3fc1c34118

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1607793

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4004186a73f5f6a7416ef4dc61f3923104df8cd