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

Change-Id: Id4fa1e193997728aa25ef0319558ff87ce2dd78a