Merge "drm/msm/sde: remove type name field in resource manager"