Merge "Change AudioTrack resampling buffers from 3 to 2"