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

Change-Id: I13b3f4f319d0e9b2719aed814860f3381cdafb47