Merge "Fix AIBinder_linkToDeath cookies" into rvc-dev am: 7284bf15da am: 9201d1500a am: 5e9c2b121e

Change-Id: I7fcd2ab7e1bcd53b6efa619097d94cc80b4168a7