Merge "binderRpcTest: stronger check for synchronous cbs"