Merge "Give uncrypt access to /proc/cmdline."
diff --git a/private/service_contexts b/private/service_contexts
index 7dc8341..86a6032 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -126,6 +126,7 @@
 recovery                                  u:object_r:recovery_service:s0
 restrictions                              u:object_r:restrictions_service:s0
 rttmanager                                u:object_r:rttmanager_service:s0
+rttmanager2                               u:object_r:rttmanager_service:s0
 samplingprofiler                          u:object_r:samplingprofiler_service:s0
 scheduling_policy                         u:object_r:scheduling_policy_service:s0
 search                                    u:object_r:search_service:s0
diff --git a/private/surfaceflinger.te b/private/surfaceflinger.te
index b33035e..ed67597 100644
--- a/private/surfaceflinger.te
+++ b/private/surfaceflinger.te
@@ -84,7 +84,6 @@
 allow surfaceflinger self:capability sys_nice;
 allow surfaceflinger proc_meminfo:file r_file_perms;
 r_dir_file(surfaceflinger, cgroup)
-r_dir_file(surfaceflinger, sysfs_type)
 r_dir_file(surfaceflinger, system_file)
 allow surfaceflinger tmpfs:dir r_dir_perms;
 allow surfaceflinger system_server:fd use;
diff --git a/public/lmkd.te b/public/lmkd.te
index 208720c..0ff9518 100644
--- a/public/lmkd.te
+++ b/public/lmkd.te
@@ -18,7 +18,7 @@
 allow lmkd system_server:file write;
 
 ## Writes to /sys/module/lowmemorykiller/parameters/minfree
-r_dir_file(lmkd, sysfs_type)
+r_dir_file(lmkd, sysfs_lowmemorykiller)
 allow lmkd sysfs_lowmemorykiller:file w_file_perms;
 
 # Send kill signals