Merge "Add multichannel capability to AudioFlinger" into lmp-dev