Merge "binderRpcTest: assert on wait_for timeout"