Merge "A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet." into gingerbread