Merge "Update driver to follow new sensor_t struct after inclusion flags and maxDelay fields."
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 016a452..9f79b96 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -85,8 +85,6 @@
 
 BOARD_SEPOLICY_UNION += \
 	file_contexts \
-	genfs_contexts \
-	adbd.te \
 	device.te \
 	domain.te \
 	drmserver.te \
diff --git a/kernel b/kernel
index cf435f2..cc1cc57 100644
--- a/kernel
+++ b/kernel
Binary files differ
diff --git a/sepolicy/adbd.te b/sepolicy/adbd.te
deleted file mode 100644
index 3855987..0000000
--- a/sepolicy/adbd.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow adbd ffs:file rw_file_perms;
-allow adbd ffs:dir search;
diff --git a/sepolicy/file.te b/sepolicy/file.te
index fe128dd..cabfe13 100644
--- a/sepolicy/file.te
+++ b/sepolicy/file.te
@@ -1,3 +1 @@
-type ffs, fs_type;
-
 type sysfs_charge_enabled, fs_type, sysfs_type;
diff --git a/sepolicy/genfs_contexts b/sepolicy/genfs_contexts
deleted file mode 100644
index 17ddc45..0000000
--- a/sepolicy/genfs_contexts
+++ /dev/null
@@ -1 +0,0 @@
-genfscon functionfs / u:object_r:ffs:s0