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