Merge "Stop leaking DeathRecipient and BinderProxy instances"