Merge "libbinder: Fix binderRpcTest flake"