Merge "Fix build, update mock drm plugin"