am 7f4d5714: am e384d75b: Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev

* commit '7f4d5714f3f0ab4efaf2d0929a9f984467ef95c7':
  Fix a typo that caused the high quality resampler to produce garbage