am 6ae7ea94: (-s ours) am 8828d86e: DO NOT MERGE Fix race condition between binder deaths

* commit '6ae7ea942fc89b1899da267253c5c78596ef5aa1':
  DO NOT MERGE Fix race condition between binder deaths