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

This reverts commit 8213615461f7d39620e44f73980acc6107c76ac7.

Change-Id: Id2982eafadc5d1c307b60c1f8abe78df8dc8b82e
(cherry picked from commit e2f5ea14c5d76d66c978dd42090366d4f0e96f40)
diff --git a/libc/bionic/system_properties.cpp b/libc/bionic/system_properties.cpp
index b2a67da..5aefbaf 100644
--- a/libc/bionic/system_properties.cpp
+++ b/libc/bionic/system_properties.cpp
@@ -942,9 +942,9 @@
     return items;
 }
 
-static bool initialize_properties_from_file(const char *filename) {
+static bool initialize_properties() {
+    FILE* file = fopen("/property_contexts", "re");
 
-    FILE* file = fopen(filename, "re");
     if (!file) {
         return false;
     }
@@ -988,20 +988,6 @@
 
     free(buffer);
     fclose(file);
-
-    return true;
-}
-
-static bool initialize_properties() {
-    // TODO: Change path to /system/property_contexts after b/27805372
-    if (!initialize_properties_from_file("/plat_property_contexts")) {
-        return false;
-    }
-
-    // TODO: Change path to /vendor/property_contexts after b/27805372
-    // device-specific property context is optional, so load if it exists.
-    initialize_properties_from_file("/nonplat_property_contexts");
-
     return true;
 }