Merge "Enable multiple concurrent binderLibTest instances" am: 06d83ad741
am: 12a04a524b

Change-Id: I4f5d47d6d239d0df4b8e994645cd5bde4e45b88f