Merge branch jb_2.5 of git://codeaurora.org/platform/hardware/qcom/…

…media into d2

Change-Id: I847c869d5b5d71469228e08c117df392a5f235ee