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

Change-Id: Ida4980c4938e2a8fbdc487a2e7144328e7c6296d