Merge "binderRpcTest: undo ThreadPoolLimit optimization"