Merge "tombstoned: make missing O_TMPFILE workaround actually work around."
am: a3d95cf2f8

Change-Id: If0948c05b7a2f21146003f5158190581f2d5bd2e