Merge branch 'jb_2.6_1' of git://codeaurora.org/platform/hardware/qcom/media into cm-10.2