Revert "security: update tests after property_context split"

This reverts commit b8ec0764dc814c2c0185428babee7da878574823.

Change-Id: I24f88cd356217b28d2b861dff5c12b58ce897ffb
(cherry picked from commit 5bf22d00689704f3cf62689d9c18d887b4738a07)
diff --git a/hostsidetests/security/Android.mk b/hostsidetests/security/Android.mk
index ce933d4..2704850 100644
--- a/hostsidetests/security/Android.mk
+++ b/hostsidetests/security/Android.mk
@@ -40,7 +40,7 @@
 
 selinux_plat_file_contexts := $(call intermediates-dir-for,ETC,plat_file_contexts)/plat_file_contexts
 
-selinux_plat_property_contexts := $(call intermediates-dir-for,ETC,plat_property_contexts)/plat_property_contexts
+selinux_general_property_contexts := $(call intermediates-dir-for,ETC,general_property_contexts)/general_property_contexts
 
 selinux_plat_service_contexts := $(call intermediates-dir-for,ETC,plat_service_contexts)/plat_service_contexts
 
@@ -50,7 +50,7 @@
     $(selinux_plat_seapp_contexts) \
     $(selinux_plat_seapp_neverallows) \
     $(selinux_general_file_contexts) \
-    $(selinux_plat_property_contexts) \
+    $(selinux_general_property_contexts) \
     $(selinux_plat_service_contexts)
 
 selinux_general_policy := $(call intermediates-dir-for,ETC,general_sepolicy.conf)/general_sepolicy.conf
diff --git a/hostsidetests/security/src/android/security/cts/SELinuxHostTest.java b/hostsidetests/security/src/android/security/cts/SELinuxHostTest.java
index 1799fb8..b3f4ad7 100644
--- a/hostsidetests/security/src/android/security/cts/SELinuxHostTest.java
+++ b/hostsidetests/security/src/android/security/cts/SELinuxHostTest.java
@@ -347,12 +347,12 @@
         /* obtain property_contexts file from running device */
         devicePcFile = File.createTempFile("property_contexts", ".tmp");
         devicePcFile.deleteOnExit();
-        mDevice.pullFile("/plat_property_contexts", devicePcFile);
+        mDevice.pullFile("/property_contexts", devicePcFile);
 
         /* retrieve the AOSP property_contexts file from jar */
-        aospPcFile = copyResourceToTempFile("/plat_property_contexts");
+        aospPcFile = copyResourceToTempFile("/general_property_contexts");
 
-        assertFileEquals(aospPcFile, devicePcFile);
+        assertFileStartsWith(aospPcFile, devicePcFile);
     }
 
     /**