Revert "audio: fix headset + speaker path" am: 9388a729d0
am: 3925384f9d

Change-Id: If82cb47614ea7af1769e02e8167e54c72ba1b551