Merge branch 'jb_2.5' of git://codeaurora.org/platform/hardware/qcom/media into d2

Change-Id: I07ea7d81beec4bfdabc4dedbdc14932396c41ee5