Merge "libbinder: test mapping += CtsNdkBinderTestCases" am: d012620349 am: f93517dad8 am: 9c16bee98e
am: 3788f98602

Change-Id: I220add42b32d63b8195fe3c2501db430a07225bf