Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread