Merge "Add tests for java.nio.spi.FileTypeDetector"