drivers/media/platform/msm/vidc: Merge s3ve3g changes