Merge "AudioTrack, AudioRecord: Fix latency computation" into oc-mr1-dev