am 5fa7aac8: Merge "Fix bug 40640864 Use a death handler on audio focus changes...
am 5fa7aac8: Merge "Fix bug 40640864 Use a death handler on audio focus changes from mode" into honeycomb-mr1
* commit '5fa7aac8':
Fix bug 40640864 Use a death handler on audio focus changes from mode