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

Change-Id: Id825764914a160492f4b741a5b28799f99cacf98