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