Merge "Remove file referenced by srcs and tool_files"