am ad707d8f: (-s ours) am 7d93b757: (-s ours) am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread

* commit 'ad707d8f9aaff9cd1a121cb769772c921d870117':
  MP3Extractor and MP3 decoder fixes - DO NOT MERGE