Merge "base: move TemporaryFile and TemporaryDir to android-base/file.h" am: e77298ce9f
am: 1e266b14be

Change-Id: I2941d4808758977f1312ec0e8f0f41593be54617