Merge "mm-video-vidc: change buffer index logic in EBD"