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

This reverts commit c5ffdd4bb44bae3ad67ecea745f79b0a05015708.

Change-Id: I4c5fa6c68cbf0124117153660a2fd363f72388b6
(cherry picked from commit 8cbd925748b9ca04fae9c02bb096f83a470c76d5)
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index a526e24..87784bd 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -86,14 +86,13 @@
     file_contexts.bin \
     nonplat_file_contexts \
     nonplat_mac_permissions.xml \
-    nonplat_property_contexts \
     nonplat_seapp_contexts \
     nonplat_service_contexts \
     plat_file_contexts \
     plat_mac_permissions.xml \
-    plat_property_contexts \
     plat_seapp_contexts \
     plat_service_contexts \
+    property_contexts \
     selinux_version \
     sepolicy