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

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

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