Merge "FileInputStream: Fix FD leak when opening a dir."