Merge "Don't use libbase macros in binderRpcTest" into main am: dd07deae am:...

Merge "Don't use libbase macros in binderRpcTest" into main am: dd07deae am: 9a56b7b6 am: 87656574

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



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