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

Change-Id: I7a837f69892c614e98801640c6f60ba0c75691b1