Merge "msmcobalt: file_context: Add file context for non-hlos mount points"