Merge "libbinder: test map += binderSafeInterfaceTest"
am: 16fa89fa6b

Change-Id: I378c336a5ac18d20d1739e102fa814c5efed054d