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

Change-Id: I9c7b5b4781e90cadd8664c17cc4f0429bf51edd1