Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am: ce0bae2f47
am: 27b7101c6c

Change-Id: Idce14b6caac043b5c2880c1d46365ad0610f48a3