Merge branch jb_2.6_1 of git://codeaurora.org/platform/hardware/qco…

…m/media into jb4.3