Merge "binderDriverInterfaceTest: fix failure"