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

Change-Id: I7f505f375e76059e7f52d11e362b3208f82e53e1