am 5a586199: Merge "Fix leak of global references and AudioFocusDeathHandler objects."

* commit '5a586199cea242ea281744e8e35969ac342cbe80':
  Fix leak of global references and AudioFocusDeathHandler objects.