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

Change-Id: I21925dccea50c8367851c3eff10a9aa50af4b8f3