Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1