Merge branch 'kk_3.5_rb2.10' of git://codeaurora.org/platform/hardware/qcom/media into cm-11.0