Merge "msm: venc: Fix compile issue with oss builds"