Merge "Make FileUtils#createDir threadsafe"