mm-video: remove unneeded code from merge

Change-Id: I560370677cd465844703b44c12bf2d38eb79ffd2