changes from CM's audio-caf

Change-Id: I065d2e13d4dab1c305408cfcc131ec585240952c
[HACK] fix ringtone temporarily until proper solution is found (paulb-nl)

Change-Id: I185179d3d3c3952347663d7e7ccf47051487dbe1
msm7x30: add INCALL_MUSIC stream type to getStrategy()

Getting unknonw stream type flood in the log. This should fix it.

Change-Id: I57c75f8f8edb117fbddf72bd2784298a438e6dd0
Merge branch 'cm-11.0' of github.com:Mustaavalkosta/android_hardware_qcom_audio-legacy into kk-devel