bacon: Adjust audio outputs to reflect ULL changes

Change-Id: I26d0ad59243cb64abf7b113cefd42d3054333565
Merge remote-tracking branch 'cm/cm-11.0' into HEAD