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

* commit 'd7290ab2c133e553cb3b0019cb2e970b0c73c211':
  Normal tracks use triple buffering if resampling

Change-Id: I48226c974af1e97cb9e297691ed33b922cd73d4f