hardware/qcom/media: unified patch from Jellaxy original branch