Merge "binderRpcTest: named normal modes"