Merge "Close DirectoryStream in ActivityThread after use."