Merge "Change IAudioTrackCallback buffer return values"