Fix audio routings

Change-Id: I83c9030dcc58e152bd83fe456a2120efb2ecd010