Merge "libbinder_ndk: __ANDROID_NDK__ canary" am: 1bc89a26ce am: ee4bf4c966
am: 13fdc3d6e6

Change-Id: I1a5297be11fb4b639dce2afe04fd53405a99a30a