Merge "libbinder: test map += binderSafeInterfaceTest"