Merge "libbinder_ndk: __ANDROID_NDK__ canary"
am: 1bc89a26ce

Change-Id: I9402033210c3af5dd03446abd70ce8f1a96681c0