Merge "Replace security_context_t type"