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

Change-Id: I2c132ec891fdfb2c1708161a02f00c30d677fe71