Merge "libbinder: single-threaded binderRpcTest cleanup"