Merge "mm-video: vidc: Update the enums conflicting with dvb driver"