Merge "aaudio: fix multichannel legacy streams" into qt-dev
am: 34a740d536

Change-Id: I116607c4be234d96cae6caffb54ac5f8942071b6