Merge "Enable multichannel in AudioFlinger" into lmp-dev