Merge "file_contexts: Adding context to block devices"