Merge "Normal tracks use triple buffering if resampling" into nyc-dev
am: 9b04a02250

* commit '9b04a0225085acdf6dd4944fb43695f246669014':
  Normal tracks use triple buffering if resampling

Change-Id: Ib57f537dd43eeb58289d12b5d43e26a2503f2db1