Merge "Fix AIBinder_linkToDeath cookies" into rvc-dev am: 7284bf15da

Change-Id: I4746a9d89c5a9c9b4f1a31572da8a20ab49ca757