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

* commit '6b49e9a8829c87088dc7fbc0945237030e63327a':
  Fix for Media Server memory leak