Merge "Don't use libbase macros in binderRpcTest" into main am: dd07deaefe am: 4dc1c01d10 am: 3a2efd1426

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

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