Merge "msm: vidc: Set buffer types properly in prepare_buf for encoder"