Merge "NuPlayerRenderer: work around some racing condition in audio track"