Merge "Remove file referenced by srcs and tool_files"
am: 15304cb4ec

Change-Id: I458d5efc34f36206cc75eac44ef11b38c507dcd5