Merge "libbinder_ndk: templates -> overloading" am: 43ec5cdbe9
am: adbf04c91b

Change-Id: I77246973188ac22c040a4b45bae232fced8fb03a