Merge "Don't use libbase macros in binderRpcTest" into main