Merge "libbinder: test mapping += binderLibTest"