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

Change-Id: If120da96d1187ba05ec38dd031250293519935e4