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

Change-Id: Ifa6027a8b920ddbb140efd93dc958622fddfb76a