Merge "mm-video: Fix compilation issues."