Revert "Merge pull request #9840 from gradle/lptr/files/simplify-file-matchers"This reverts commit 72dc39d9784910196e7840ac35317bc46ef4c4a1, reversingchanges made to 69ffd7ea87b343cb6f0f03b947b7605a5bea02b1.
Import :kotlin-dsl and :kotlin-dsl-test-fixturesBoth in one go because of their circular dependencyTests are failing because of the lack of :customInstallationSigned-off-by: Paul Merlin <paul@gradle.com>