am 4df3ab54: am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread

Merge commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f'

* commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f':
  Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.