Merge "Revert "Update drm hal to find drm@1.1 factories""