am 1c487938: (-s ours) am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths"

* commit '1c487938c45317997389b9ad101fc6739e3fe847':
  Revert "DO NOT MERGE Fix race condition between binder deaths"