Fix handset audio routing paths. (Fixes Tmo visual voice mail)

Change-Id: Icb84e8c12bb12ddad53723bd835d8fb519601214
Merge branch 'cm-11.0' into martincz