Merge "Update channel fields at same place in AudioTrack and AudioRecord"