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