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

Change-Id: Ia4020577a1496f185f49bedd0fa218b3f39b7c30