am a450ef06: am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1

* commit 'a450ef06689b44415a3bbbfb4aaad082189eb7ad':
  Fix for Media Server memory leak