Merge "Merge "Normal tracks use triple buffering if resampling" into nyc-dev am: 9b04a02250 am: 6f63fb6f31" into nyc-mr1-dev-plus-aosp
am: 9eb647dc04

* commit '9eb647dc04c68c9971646528389b8fa14c80fbf9':

Change-Id: Iac1b997b38815ad00ce99414d0659d57de5e248a