Merge "restorecon tombstone directory."