Merge "binderDriverInterfaceTest: fix failure" am: 8cd96a1b87
am: a3c14687bf

Change-Id: I863d6c55db4798dc979fcecdc2b20703e79c4f6d