Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""