Merge "libbinder: test mapping += binderLibTest" am: 9bcd251526
am: 1abd5f5579

Change-Id: I37bde12fb2989d4920d9679faf861a6d3bae5245