Merge "libbinder_ndk: clarify local AIBinder_linkToDeath" am: e5e02ecbb9
am: ce2d5f1d28

Change-Id: I9b6d00724deecbd04c1b12e5ce441ad649c53f05