Merge "base: Add TemporaryFile::DoNotRemove()." am: 04bf02374c
am: 8e7844d69e

Change-Id: Iaec0312075a7b9c5dbed490271ab5183e3e163d5