Merge "Update AudioTrack code to match AudioRecord"