Merge branch 'jb_2.5' of git://codeaurora.org/platform/hardware/qcom/audio into cm-10.2

Change-Id: If58c40a26d116bbc9379237499682dcb4f700197