am 8d0e2b98: am 5fa7aac8: Merge "Fix bug 4064086 Use a death handler on audio focus changes from mode" into honeycomb-mr1

* commit '8d0e2b9857e5f77ced233dc408a7acd9e8ab2e8c':
  Fix bug 4064086 Use a death handler on audio focus changes from mode