Merge "Fix DRM prebuilt vendor module handling" into oc-dev