Merge "AnimationControllers: Only unlinkToDeath if previously linked" into pi-dev
am: 6f53a85569

Change-Id: I39caa0a8cbd6ddc3f91f50abd99ddfe2480ac595