Merge "libbinder: test mapping += CtsNdkBinderTestCases" am: d012620349
am: f93517dad8

Change-Id: Ifbcf678bda5b3bb8b465363f444e55ff6d329efa