Merge "Move TempFileUtil to testutil package"