am f664d6f9: am b083d3b8: Merge "Initialize resampling buffer per track."

* commit 'f664d6f916516860d3e4cf82339d47c6f4fd24a2':
  Initialize resampling buffer per track.