Merge "msm: vidc: Fix switch case" into msm-4.9