Merge "libbinder*: ToString - pound def made consistent" am: 80a63e94ca

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

Change-Id: Id6f9a6e0b9a08495cf45f38414d5eb9c503e389b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>