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

Change-Id: I4e00d24ff10d00a12e58f82a1a4c961b3d13b817