am 04c6d73f: Revert "DO NOT MERGE Fix race condition between binder deaths"

* commit '04c6d73fd0e4472505275688ef8497bc6697647c':
  Revert "DO NOT MERGE Fix race condition between binder deaths"