Merge "Revert "Remove d8-compat-dx dependencies""