am a2549bb6: Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread

Merge commit 'a2549bb644d8ca4b0209d6d2f0c4160521789aa9' into gingerbread-plus-aosp

* commit 'a2549bb644d8ca4b0209d6d2f0c4160521789aa9':
  Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.