Merge "libbinder_ndk: unlinkToDeath dead proxy" am: a6697ec140
am: 2daa96e898

Change-Id: I5b3071a993d69446d7e97f7b3d19ba4006cc12a4