Merge "SELinux: split property_contexts into platform and non-platform components." am: f91d163625
am: cb0a92be8b

Change-Id: Icf60fccc8999b98dbf07cd52a4d34ce2b118dab8