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

Change-Id: I2927ef373cbc8329cfbab3a05fb30e5cfd0b6891