Merge "DockAudio: Route audio via dock for Samsung devices" into cm-10.2