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

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

Change-Id: Id47ba1b630944c7623ec138fc2a76c9fe0ef1838