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