Merge \"init.hikey.rc: set right user and group for uim service\"
am: 0c5a64eee5

Change-Id: I78657a0edc341424985a148c8bf10d23e9238d9a
diff --git a/init.hikey.rc b/init.hikey.rc
index 5c49333..33c7cb0 100644
--- a/init.hikey.rc
+++ b/init.hikey.rc
@@ -26,7 +26,6 @@
     # For legacy support
     # See storage config details at http://source.android.com/tech/storage/
     # since /storage is mounted on post-fs in init.rc
-    symlink /sdcard /mnt/sdcard
     symlink /sdcard /storage/sdcard0
 
     # BT LED sysfs entry
diff --git a/sepolicy/file.te b/sepolicy/file.te
deleted file mode 100644
index 45c5117..0000000
--- a/sepolicy/file.te
+++ /dev/null
@@ -1 +0,0 @@
-type configfs, fs_type;
diff --git a/sepolicy/genfs_contexts b/sepolicy/genfs_contexts
deleted file mode 100644
index 50c7cd7..0000000
--- a/sepolicy/genfs_contexts
+++ /dev/null
@@ -1 +0,0 @@
-genfscon configfs / u:object_r:configfs:s0