Merge "SELinux: split property_contexts into platform and non-platform components." am: ca38726337
am: cf84518b28

Change-Id: I75f57588a4f6a5abca3db3de82a55143f06fa9f3