Merge changes Ia61aab73,Ic5c00211 am: 307dc6063d
am: fc3f4ed455

* commit 'fc3f4ed455651a3eeb9ee6b0c078ef4bf5901b22':
  hikey: Fix README about kernel version
  hikey: Use Image-dtb-4.1 for kernel 4.1

Change-Id: I610fd7383126a2bda5ab8b8526bd60c8900b482f
diff --git a/init.hikey.rc b/init.hikey.rc
index f870212..07ec560 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