Merge "libbinder_ndk: integration test for linkToDeath" am: 3964935f74
am: 358d8125a0

Change-Id: I9e04e6ebf156a42218bf601921b93ba02a20c55f