Merge "tombstoned: don't bail out if we fail to unlink a file that isn't there." am: 57adfb84aa
am: 2ad163b417

Change-Id: I32713edd4d3d0c1d36a3c811ea317567195489b0