Merge "mm-video: resolve compilation issues with conflicting declarations"