drivers/media/platform/msm: Merge s3ve3g changes