Merge "binderDriverInterfaceTest: fix failure" am: 8cd96a1b87 am: a3c14687bf am: 48f2af7772
am: c43b5214c2

Change-Id: I6fc553c2d35f68ec22ea56ef712aabb589732eb5