Merge commit 'bd623daff1f261a0e794f059d90ba5907eb5a89a' into gingerbread-plus-aosp * commit 'bd623daff1f261a0e794f059d90ba5907eb5a89a': Undo IMediaContainerService changes
Merge commit 'bd623daff1f261a0e794f059d90ba5907eb5a89a' into gingerbread-plus-aosp * commit 'bd623daff1f261a0e794f059d90ba5907eb5a89a': Undo IMediaContainerService changes