Merge "AudioTrack::obtainBuffer() now returns number of non-contiguous frames"