Merge "AudioTrack: Fix extended timestamp offset" into oc-mr1-dev