Readd support for old perfd socket

* This is still used by older 8916 blobs and possibly others,
  move the label out of the msm8974 folder and readd the old rules
* This essentially reverts 3173a8c8b8a93e55403f65e60b31d937ea8a18b4

Change-Id: I5c51052b3622e63a14f74600cdbb76d515001841
diff --git a/common/file_contexts b/common/file_contexts
index 861729f..d6241e4 100644
--- a/common/file_contexts
+++ b/common/file_contexts
@@ -315,6 +315,7 @@
 /data/time(/.*)?                                                    u:object_r:time_data_file:s0
 /data/nfc(/.*)?                                                     u:object_r:nfc_data_file:s0
 /data/system/perfd(/.*)?                                            u:object_r:mpctl_data_file:s0
+/data/misc/perfd(/.*)?                                              u:object_r:mpctl_socket:s0
 /data/misc/iop(/.*)?                                                u:object_r:iop_data_file:s0
 /data/misc/display(/.*)?                                            u:object_r:display_misc_file:s0
 /data/misc/ipa(/.*)?                                                u:object_r:ipacm_data_file:s0
diff --git a/common/perfd.te b/common/perfd.te
index fb85729..bde7324 100644
--- a/common/perfd.te
+++ b/common/perfd.te
@@ -14,7 +14,8 @@
 allow perfd self:{ netlink_kobject_uevent_socket socket} create_socket_perms;
 
 # mpctl socket
-allow perfd mpctl_socket:sock_file rw_file_perms;
+allow perfd mpctl_socket:dir rw_dir_perms;
+allow perfd mpctl_socket:sock_file create_file_perms;
 
 # default_values file
 allow perfd mpctl_data_file:dir rw_dir_perms;
diff --git a/msm8974/file_contexts b/msm8974/file_contexts
index 4383656..48d10ef 100644
--- a/msm8974/file_contexts
+++ b/msm8974/file_contexts
@@ -40,6 +40,3 @@
 /dev/block/platform/msm_sdcc\.1/by-name/cache                 u:object_r:cache_block_device:s0
 /dev/block/mmcblk0                                            u:object_r:root_block_device:s0
 /dev/block/mmcblk0rpmb                                        u:object_r:rpmb_device:s0
-
-# mpdecision
-/data/misc/perfd(/.*)?                                        u:object_r:mpctl_socket:s0