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

Change-Id: Iaa3c3d822ae671c7a67d8ec57d7399984e5787f3