Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev