am f9130aac: am 561a0099: Merge "Add file_contexts entries for socket files."

* commit 'f9130aac4881df962d54ce6fc2a710a8b211f8d9':
  Add file_contexts entries for socket files.