Merge "Fix 7.1 audio playback from AudioTrack" into lmp-dev