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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee3fed1ac21b27b633ee5a1b4c7666f3839e27c4