Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread