resolved conflicts for merge of 313e4056 to lmp-dev-plus-aosp

Change-Id: I2f41cef9b3203117e24f8dba7000d8f4c564dcb8

dumpstate.te

@@ -103,6 +103,9 @@ allow dumpstate net_data_file:file r_file_perms;
 allow dumpstate tombstone_data_file:dir r_dir_perms;
 allow dumpstate tombstone_data_file:file r_file_perms;
 
+# Access /system/bin executables to determine type of executable.
+allow dumpstate {drmserver_exec mediaserver_exec sdcardd_exec surfaceflinger_exec}:file r_file_perms;
+
 service_manager_local_audit_domain(dumpstate)
 auditallow dumpstate {
     service_manager_type