audio: fix headset + speaker path am: 161ffb5fef
am: 77771887e1

Change-Id: I0499e0296a57772e43c14325239a8334735298d8