Merge "Add tests for java.nio.spi.FileTypeDetector"
am: 5424db1dbe

Change-Id: Ied1d075054ecf290d7834b24968d80854d13391e