s4: Re-add digital dock routes for LPA and tunnel

* Change got stomped when updating to 4.4
* For supporting music playback over USB.

Change-Id: Ida5b807e391be8349db52fa5d21a5c8852d1db65
Merge branch 'cm' into HEAD