Merge "libbinder_ndk: __ANDROID_NDK__ canary"