Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo