am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService

* commit '46e631178e3420fee182e7d9d1ddfdbca9355bc1':
  DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService