T6-common: line-up and adjust our audio sources

Change-Id: Iec445adebbfb939d34c34b373b16dd0e14f3683a