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

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