Merge "Add file_contexts entries for socket files."