Merge "msm: vidc: add support for concurrent hfi devices"