Merge "msm: vidc: Fix a bug in defining timeout"