Merge "Fix some AudioTrack related issues."