Merge "hikey: Fix fstab.hikey-3.18 to not mount cache partition" am: 4918df1981
am: e684342a0a

Change-Id: I617f87b85300d019c38f40f9f8b4045342880b50