Merge "Update file_contexts for contexthub HAL 1.1"