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